debian/changelog | 7 +++++++ debian/libgl1-mesa-dev.install | 4 ++-- debian/libgl1-mesa-swx11-dev.install | 4 ++-- debian/libgl1-mesa-swx11.install | 2 +- debian/libglu1-mesa-dev.install | 6 +++--- debian/libglu1-mesa.install | 2 +- debian/rules | 2 ++ 7 files changed, 18 insertions(+), 9 deletions(-)
New commits: commit eebc3ccbcf22ac57ee3c34fe9af0bae46e0aeb85 Author: Timo Aaltonen <[email protected]> Date: Sat Jan 9 19:58:38 2010 +0200 Moving just libGL.so.* to /usr/lib/mesa broke all builds depending on libGL.so or gl.pc. Fix the swx11 target --libdir to use /usr/lib/mesa. diff --git a/debian/changelog b/debian/changelog index c88cc6c..3fd74b3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +mesa (7.7-0ubuntu2) lucid; urgency=low + + * Moving just libGL.so.* to /usr/lib/mesa broke all builds depending on + libGL.so or gl.pc. Fix the swx11 target --libdir to use /usr/lib/mesa. + + -- Timo Aaltonen <[email protected]> Sat, 09 Jan 2010 11:21:13 +0200 + mesa (7.7-0ubuntu1) lucid; urgency=low * Merge from Debian experimental. diff --git a/debian/libgl1-mesa-dev.install b/debian/libgl1-mesa-dev.install index dac5ebd..2eb49b3 100644 --- a/debian/libgl1-mesa-dev.install +++ b/debian/libgl1-mesa-dev.install @@ -1,2 +1,2 @@ -usr/lib/libGL.so -usr/lib/pkgconfig/gl.pc +usr/lib/mesa/libGL.so +usr/lib/mesa/pkgconfig/gl.pc usr/lib/pkgconfig diff --git a/debian/libgl1-mesa-swx11-dev.install b/debian/libgl1-mesa-swx11-dev.install index f353c59..88c59e1 100644 --- a/debian/libgl1-mesa-swx11-dev.install +++ b/debian/libgl1-mesa-swx11-dev.install @@ -1,2 +1,2 @@ -usr/lib/libGL.a -usr/lib/libGL.so +usr/lib/mesa/libGL.a +usr/lib/mesa/libGL.so diff --git a/debian/libgl1-mesa-swx11.install b/debian/libgl1-mesa-swx11.install index 6d70d0f..dcdb2c4 100644 --- a/debian/libgl1-mesa-swx11.install +++ b/debian/libgl1-mesa-swx11.install @@ -1 +1 @@ -usr/lib/libGL.so.* +usr/lib/mesa/libGL.so.* diff --git a/debian/libglu1-mesa-dev.install b/debian/libglu1-mesa-dev.install index a3df1f9..4d01a7b 100644 --- a/debian/libglu1-mesa-dev.install +++ b/debian/libglu1-mesa-dev.install @@ -1,5 +1,5 @@ usr/include/GL/glu.h usr/include/GL/glu_mangle.h -usr/lib/libGLU.a -usr/lib/libGLU.so -usr/lib/pkgconfig/glu.pc +usr/lib/mesa/libGLU.a +usr/lib/mesa/libGLU.so +usr/lib/mesa/pkgconfig/glu.pc usr/lib/pkgconfig diff --git a/debian/libglu1-mesa.install b/debian/libglu1-mesa.install index 9ad0953..4589286 100644 --- a/debian/libglu1-mesa.install +++ b/debian/libglu1-mesa.install @@ -1 +1 @@ -usr/lib/libGLU.so.* +usr/lib/mesa/libGLU.so.* diff --git a/debian/rules b/debian/rules index 215b8e8..71d3a49 100755 --- a/debian/rules +++ b/debian/rules @@ -137,6 +137,7 @@ confflags-swx11+glu = \ --disable-egl \ --disable-glut \ --disable-glw \ + --libdir=/usr/lib/mesa \ CFLAGS="$(CFLAGS)" confflags-swx11+glu-static = \ @@ -147,6 +148,7 @@ confflags-swx11+glu-static = \ --disable-egl \ --disable-glut \ --disable-glw \ + --libdir=/usr/lib/mesa \ CFLAGS="$(CFLAGS)" confflags-swx11+glu-i386-i686 = \ -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
