mesa: Changes to 'ubuntu'
debian/changelog | 16 ++++++++++++++++
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-dev.links | 2 --
debian/libglu1-mesa.install | 2 +-
debian/rules | 3 ---
8 files changed, 25 insertions(+), 14 deletions(-)
New commits:
commit d0af6924f1cf2de8bb2c74e74c68902e87d5de91
Author: Alberto Milone <alberto.milone@canonical.com>
Date: Wed Jan 13 15:26:30 2010 +0100
* debian/rules:
- Remove invalid "install -d" command.
- Do not pass --libdir=/usr/lib/mesa flag any more.
* debian/libgl1-mesa-dev.install, libgl1-mesa-swx11-dev.install,
libgl1-mesa-swx11.install, libglu1-mesa-dev.install,
libglu1-mesa.install:
- Install *.pc files in /usr/lib/pkgconfig instead of
/usr/lib/mesa/pkgconfig.
- Do not Install libGLU* in /usr/lib/mesa (LP: #506547).
* debian/libglu1-mesa-dev.links:
- Remove file as we install libGLU in the right place now.
diff --git a/debian/changelog b/debian/changelog
index f95fac9..f4f3356 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+mesa (7.7-0ubuntu5) UNRELEASED; urgency=low
+
+ * debian/rules:
+ - Remove invalid "install -d" command.
+ - Do not pass --libdir=/usr/lib/mesa flag any more.
+ * debian/libgl1-mesa-dev.install, libgl1-mesa-swx11-dev.install,
+ libgl1-mesa-swx11.install, libglu1-mesa-dev.install,
+ libglu1-mesa.install:
+ - Install *.pc files in /usr/lib/pkgconfig instead of
+ /usr/lib/mesa/pkgconfig.
+ - Do not Install libGLU* in /usr/lib/mesa (LP: #506547).
+ * debian/libglu1-mesa-dev.links:
+ - Remove file as we install libGLU in the right place now.
+
+ -- Alberto Milone <alberto.milone@canonical.com> Wed, 13 Jan 2010 15:23:17 +0100
+
mesa (7.7-0ubuntu4) lucid; urgency=low
* debian/libgl1-mesa-dev.links:
diff --git a/debian/libgl1-mesa-dev.install b/debian/libgl1-mesa-dev.install
index 2eb49b3..0b55000 100644
--- a/debian/libgl1-mesa-dev.install
+++ b/debian/libgl1-mesa-dev.install
@@ -1,2 +1,2 @@
-usr/lib/mesa/libGL.so
-usr/lib/mesa/pkgconfig/gl.pc usr/lib/pkgconfig
+usr/lib/libGL.so usr/lib/mesa/
+usr/lib/pkgconfig/gl.pc
diff --git a/debian/libgl1-mesa-swx11-dev.install b/debian/libgl1-mesa-swx11-dev.install
index 88c59e1..d3cee7a 100644
--- a/debian/libgl1-mesa-swx11-dev.install
+++ b/debian/libgl1-mesa-swx11-dev.install
@@ -1,2 +1,2 @@
-usr/lib/mesa/libGL.a
-usr/lib/mesa/libGL.so
+usr/lib/libGL.a usr/lib/mesa/
+usr/lib/libGL.so usr/lib/mesa/
diff --git a/debian/libgl1-mesa-swx11.install b/debian/libgl1-mesa-swx11.install
index dcdb2c4..27259b0 100644
--- a/debian/libgl1-mesa-swx11.install
+++ b/debian/libgl1-mesa-swx11.install
@@ -1 +1 @@
-usr/lib/mesa/libGL.so.*
+usr/lib/libGL.so.* usr/lib/mesa/
diff --git a/debian/libglu1-mesa-dev.install b/debian/libglu1-mesa-dev.install
index 4d01a7b..a3df1f9 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/mesa/libGLU.a
-usr/lib/mesa/libGLU.so
-usr/lib/mesa/pkgconfig/glu.pc usr/lib/pkgconfig
+usr/lib/libGLU.a
+usr/lib/libGLU.so
+usr/lib/pkgconfig/glu.pc
diff --git a/debian/libglu1-mesa-dev.links b/debian/libglu1-mesa-dev.links
deleted file mode 100644
index c9e42f0..0000000
--- a/debian/libglu1-mesa-dev.links
+++ /dev/null
@@ -1,2 +0,0 @@
-/usr/lib/mesa/libGLU.so /usr/lib/libGLU.so
-/usr/lib/mesa/libGLU.a /usr/lib/libGLU.a
diff --git a/debian/libglu1-mesa.install b/debian/libglu1-mesa.install
index 4589286..9ad0953 100644
--- a/debian/libglu1-mesa.install
+++ b/debian/libglu1-mesa.install
@@ -1 +1 @@
-usr/lib/mesa/libGLU.so.*
+usr/lib/libGLU.so.*
diff --git a/debian/rules b/debian/rules
index e5cdd3f..14b9cc2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -137,7 +137,6 @@ confflags-swx11+glu = \
--disable-egl \
--disable-glut \
--disable-glw \
- --libdir=/usr/lib/mesa \
CFLAGS="$(CFLAGS)"
confflags-swx11+glu-static = \
@@ -148,7 +147,6 @@ confflags-swx11+glu-static = \
--disable-egl \
--disable-glut \
--disable-glw \
- --libdir=/usr/lib/mesa \
CFLAGS="$(CFLAGS)"
confflags-swx11+glu-i386-i686 = \
@@ -232,7 +230,6 @@ binary-arch: install
dh_install -s --sourcedir=debian/tmp --list-missing
# Create an ld.so.conf which says where to find libGL from Mesa
- $(INSTALL) -d $(CURDIR)/debian/libgl1-mesa-glx/usr/lib/mesa
echo "/usr/lib/mesa" \
> $(CURDIR)/debian/libgl1-mesa-glx/usr/lib/mesa/ld.so.conf
Reply to: