debian/changelog | 13 +++++++++++++ debian/control | 14 +++++++------- debian/scripts/choose-configs | 2 +- 3 files changed, 21 insertions(+), 8 deletions(-)
New commits: commit b205a7d6e9890ae11d3aa6643a7976156b19b88b Author: Cyril Brulebois <k...@debian.org> Date: Sun Aug 28 19:07:52 2011 +0200 Upload to unstable. diff --git a/debian/changelog b/debian/changelog index d3fc0e0..07c59f9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -mesa (7.11-5) UNRELEASED; urgency=low +mesa (7.11-5) unstable; urgency=low * Merge patch from Pino Tiscano (thanks!): - Use hurd-any instead of: hurd-i386 (“wildcard archs are free”). @@ -9,7 +9,7 @@ mesa (7.11-5) UNRELEASED; urgency=low - Switch libglapi-mesa{,-dbg} arch: any. This fixes the FTBFS on hurd-i386^Wany. - -- Cyril Brulebois <k...@debian.org> Sun, 28 Aug 2011 18:55:28 +0200 + -- Cyril Brulebois <k...@debian.org> Sun, 28 Aug 2011 19:07:48 +0200 mesa (7.11-4) unstable; urgency=low commit 103926c53c4b9a1e46a2c543df710f0c1598a5b2 Author: Cyril Brulebois <k...@debian.org> Date: Sun Aug 28 19:07:42 2011 +0200 Fix FTBFS on hurd, fix uninstallability on kfreebsd. Thanks, Pino! diff --git a/debian/changelog b/debian/changelog index e1dd757..d3fc0e0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +mesa (7.11-5) UNRELEASED; urgency=low + + * Merge patch from Pino Tiscano (thanks!): + - Use hurd-any instead of: hurd-i386 (“wildcard archs are free”). + - Use any-i386 instead of: i386 kfreebsd-i386 hurd-i386. + - Rewrite a check in debian/rules to follow the same logic. + - Switch libgbm1-dbg to arch: linux-any. This fixes uninstallability + on kfreebsd-* by getting rid of this package there. + - Switch libglapi-mesa{,-dbg} arch: any. This fixes the FTBFS on + hurd-i386^Wany. + + -- Cyril Brulebois <k...@debian.org> Sun, 28 Aug 2011 18:55:28 +0200 + mesa (7.11-4) unstable; urgency=low * Use xz compression for dbg packages. diff --git a/debian/control b/debian/control index 0f592f5..4fe7bce 100644 --- a/debian/control +++ b/debian/control @@ -8,7 +8,7 @@ Build-Depends: debhelper (>= 8.1.3), quilt (>= 0.40), pkg-config, - libdrm-dev (>= 2.4.24) [!hurd-i386], + libdrm-dev (>= 2.4.24) [!hurd-any], libx11-dev, xutils-dev, x11proto-gl-dev (>= 1.4.11), @@ -94,7 +94,7 @@ Description: free implementation of the OpenGL API -- debugging symbols Package: libgl1-mesa-swx11-i686 Section: libs Priority: extra -Architecture: i386 kfreebsd-i386 hurd-i386 +Architecture: any-i386 Depends: libgl1-mesa-swx11 (= ${binary:Version}), ${shlibs:Depends}, @@ -159,7 +159,7 @@ Description: generic buffer management API -- runtime Package: libgbm1-dbg Section: debug Priority: extra -Architecture: linux-any kfreebsd-any +Architecture: linux-any Depends: libgbm1 (= ${binary:Version}), ${misc:Depends}, @@ -229,7 +229,7 @@ Section: libdevel Architecture: linux-any kfreebsd-any Depends: libegl1-mesa (= ${binary:Version}), - libdrm-dev (>= 2.4.19) [!hurd-i386], + libdrm-dev (>= 2.4.19) [!hurd-any], x11proto-dri2-dev (>= 2.1), x11proto-gl-dev (>= 1.4.11), libx11-dev, @@ -450,7 +450,7 @@ Description: free implementation of the OpenGL|ES 2.x API -- development files Package: libglapi-mesa Section: libs -Architecture: linux-any kfreebsd-any +Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -464,7 +464,7 @@ Description: free implementation of the GL API -- shared library Package: libglapi-mesa-dbg Section: debug Priority: extra -Architecture: linux-any kfreebsd-any +Architecture: any Depends: libglapi-mesa (= ${binary:Version}), ${misc:Depends}, @@ -528,7 +528,7 @@ Description: Debugging symbols for the Mesa GLX runtime #Package: libgl1-mesa-glx-i686 #Section: libs #Priority: extra -#Architecture: i386 kfreebsd-i386 hurd-i386 +#Architecture: any-i386 #Pre-Depends: libgl1-mesa-glx #Description: A free implementation of the OpenGL API -- GLX runtime [i686 optimized] # This version of Mesa provides GLX and DRI capabilities: it is capable of diff --git a/debian/scripts/choose-configs b/debian/scripts/choose-configs index ebb5221..a4c8d6b 100644 --- a/debian/scripts/choose-configs +++ b/debian/scripts/choose-configs @@ -26,7 +26,7 @@ SWX11_GLU_CONFIGS := swx11+glu swx11+glu-static ############################################################################## ## CPU-optimized configurations ############################################## -ifneq (,$(filter $(DEB_HOST_ARCH), i386 kfreebsd-i386 hurd-i386)) +ifeq ($(DEB_HOST_ARCH_CPU), i386) SWX11_GLU_CONFIGS += swx11+glu-i386-i686 endif -- To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org Archive: http://lists.debian.org/e1qxjid-000313...@vasks.debian.org