mesa: Changes to 'debian-experimental'
debian/changelog | 12 ++++++++++++
debian/control | 1 +
debian/libgl1-mesa-dri.install.in | 5 ++---
debian/libgl1-mesa-dri.install.kfreebsd.in | 6 ------
debian/libgl1-mesa-dri.install.linux.in | 10 ----------
debian/rules | 14 ++------------
6 files changed, 17 insertions(+), 31 deletions(-)
New commits:
commit 1ec38e0dd1982017d62b4b44c88a00ceafacd632
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue Aug 21 22:27:59 2012 -0700
Add Pre-Depends on multiarch-support to libgl1-mesa-dri, since we're shipping a shared library in the package; not an issue in practice since this is all post-wheezy / post-precise, but it's an archive reject error in Debian right now so let's just be complete.
diff --git a/debian/changelog b/debian/changelog
index e95b86f..bf412c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,10 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
avoids rpath problems with libtool linking to in-tree convenience
libraries.
* debian/rules: don't install libdricore*.so, this isn't a public library.
+ * Add Pre-Depends on multiarch-support to libgl1-mesa-dri, since we're
+ shipping a shared library in the package; not an issue in practice since
+ this is all post-wheezy / post-precise, but it's an archive reject error
+ in Debian right now so let's just be complete.
-- Julien Cristau <jcristau@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/control b/debian/control
index 4619749..581df44 100644
--- a/debian/control
+++ b/debian/control
@@ -601,6 +601,7 @@ Package: libgl1-mesa-dri
Section: libs
Priority: optional
Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends},
${misc:Depends}
commit 8a64f759e2d89c0b78e4a6bb34db5c6fa5f4786f
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue Aug 21 22:26:07 2012 -0700
debian/rules: don't install libdricore*.so, this isn't a public library.
diff --git a/debian/changelog b/debian/changelog
index 1298789..e95b86f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
already that we're only building drivers that we want to ship, and
avoids rpath problems with libtool linking to in-tree convenience
libraries.
+ * debian/rules: don't install libdricore*.so, this isn't a public library.
-- Julien Cristau <jcristau@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
diff --git a/debian/rules b/debian/rules
index dc82df9..23e6d44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -253,8 +253,9 @@ binary-arch: install
set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
# Files only in git, not in tarballs, OK to use rm -f here:
set -e; for file in $(NOT_INSTALLED_EITHER); do rm -f debian/tmp/$$file; done
- # No need for this .so, libglapi is just a convenience library:
+ # No need for these .so, they're just convenience libraries:
rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libglapi.so
+ rm debian/tmp/dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so
# purge .la files
find debian/tmp/ -name '*.la' -exec rm '{}' ';'
commit ac89b1de473e794963e9a0d36bda6641915b3ed2
Author: Steve Langasek <steve.langasek@ubuntu.com>
Date: Tue Aug 21 22:21:19 2012 -0700
Install all dri drivers from the DESTDIR tree, instead of copying them from the build tree; this simplifies the install rules since we know already that we're only building drivers that we want to ship, and avoids rpath problems with libtool linking to in-tree convenience libraries.
diff --git a/debian/changelog b/debian/changelog
index f973a3d..1298789 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,6 +28,13 @@ mesa (9.0~git20120821.c1114c61-1) UNRELEASED; urgency=low
* Added 15-fix-llvmpipe-test-linking.diff: Fix link failure when building
llvmpipe with --with-llvm-shared-libs. Patch from fdo bug #52617.
+ [ Steve Langasek ]
+ * Install all dri drivers from the DESTDIR tree, instead of copying them
+ from the build tree; this simplifies the install rules since we know
+ already that we're only building drivers that we want to ship, and
+ avoids rpath problems with libtool linking to in-tree convenience
+ libraries.
+
-- Julien Cristau <jcristau@debian.org> Fri, 03 Aug 2012 23:17:16 +0200
mesa (8.0.4-1) unstable; urgency=low
diff --git a/debian/libgl1-mesa-dri.install.in b/debian/libgl1-mesa-dri.install.in
index 31a01bb..5eda011 100644
--- a/debian/libgl1-mesa-dri.install.in
+++ b/debian/libgl1-mesa-dri.install.in
@@ -1,3 +1,2 @@
-# If this part gets modified, make sure to update .install.$os as well:
-build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
+dri/usr/lib/${DEB_HOST_MULTIARCH}/dri/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
+dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so* usr/lib/${DEB_HOST_MULTIARCH}/
diff --git a/debian/libgl1-mesa-dri.install.kfreebsd.in b/debian/libgl1-mesa-dri.install.kfreebsd.in
deleted file mode 100644
index 64f9660..0000000
--- a/debian/libgl1-mesa-dri.install.kfreebsd.in
+++ /dev/null
@@ -1,6 +0,0 @@
-# Keep this part in sync with libgl1-mesa-dri.install:
-# But there's no such file for kfreebsd-* any longer, so comment it out entirely:
-# build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-
-# This part is GNU/kFreeBSD-specific:
-build/dri/${DEB_HOST_MULTIARCH}/gallium/swrast_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/libgl1-mesa-dri.install.linux.in b/debian/libgl1-mesa-dri.install.linux.in
deleted file mode 100644
index 3a0cb8e..0000000
--- a/debian/libgl1-mesa-dri.install.linux.in
+++ /dev/null
@@ -1,10 +0,0 @@
-# Keep this part in sync with libgl1-mesa-dri.install:
-build/dri/${DEB_HOST_MULTIARCH}/*_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-dri/usr/lib/${DEB_HOST_MULTIARCH}/libdricore*.so*
-
-# This part is Linux-specific:
-build/dri/${DEB_HOST_MULTIARCH}/gallium/r300_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/r600_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/radeonsi_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/nouveau_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
-build/dri/${DEB_HOST_MULTIARCH}/gallium/vmwgfx_dri.so usr/lib/${DEB_HOST_MULTIARCH}/dri
diff --git a/debian/rules b/debian/rules
index 6176288..dc82df9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -248,11 +248,6 @@ binary-arch: install
dh_installdocs -s
dh_installexamples -s
- # Classic DRI and Gallium DRI are mixed up together here
- # Remove the whole tree to avoid false-positives in --list-missing, and
- # install the right files manually.
- rm -r debian/tmp/dri/usr/lib/$(DEB_HOST_MULTIARCH)/dri
-
# Also get rid of other files which aren't installed. Do not
# use -f to ensure we notice disappearing files:
set -e; for file in $(NOT_INSTALLED); do rm debian/tmp/$$file; done
@@ -265,12 +260,6 @@ binary-arch: install
dh_install -s --fail-missing
-# If the llvmpipe driver was built, copy it to the package dir
-ifneq (,$(filter swrast,$(GALLIUM_DRIVERS)))
- dh_install -plibgl1-mesa-dri build/dri/$(DEB_HOST_MULTIARCH)/gallium/swrast_dri.so \
- usr/lib/${DEB_HOST_MULTIARCH}/dri
-endif
-
dh_installman -s
dh_lintian -s
dh_link -s
Reply to: