mesa: Changes to 'debian-experimental'
debian/changelog | 7 +++++++
debian/not-installed | 21 ++++++++++++++++++++-
2 files changed, 27 insertions(+), 1 deletion(-)
New commits:
commit 06510fbcb846b6a49a2992085ad878b60bf40fab
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jan 25 23:44:05 2011 +0000
Use wildcards to avoid specifying the versions, and sort.
diff --git a/debian/not-installed b/debian/not-installed
index 48f257b..b052f8a 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -29,12 +29,12 @@ NOT_INSTALLED := \
# Architecture-specific additional files:
NOT_INSTALLED_i386 = \
usr/lib/i686/cmov/libGL.so \
- usr/lib/i686/cmov/libGLw.so.1 \
- usr/lib/i686/cmov/libGLw.so \
usr/lib/i686/cmov/libGLU.so \
- usr/lib/i686/cmov/libGLU.so.1.3.071000 \
- usr/lib/i686/cmov/libGLw.so.1.0.0 \
usr/lib/i686/cmov/libGLU.so.1 \
+ usr/lib/i686/cmov/libGLU.so.1.* \
+ usr/lib/i686/cmov/libGLw.so \
+ usr/lib/i686/cmov/libGLw.so.1 \
+ usr/lib/i686/cmov/libGLw.so.1.* \
usr/lib/i686/cmov/pkgconfig/glw.pc \
usr/lib/i686/cmov/pkgconfig/glu.pc \
usr/lib/i686/cmov/pkgconfig/gl.pc \
commit b4f6780128ff60fb4b25dbef0626530978683b1f
Author: Cyril Brulebois <kibi@debian.org>
Date: Tue Jan 25 22:58:14 2011 +0000
Fix FTBFS on i386: Add some files to debian/not-installed.
Do that on a per-architecture fashion (those are under
/usr/lib/i686/cmov/).
diff --git a/debian/changelog b/debian/changelog
index bd8e383..2cd6479 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mesa (7.10-2) UNRELEASED; urgency=low
+
+ * Fix FTBFS on i386: Add some files to debian/not-installed, on a
+ per-architecture fashion (those are under /usr/lib/i686/cmov/).
+
+ -- Cyril Brulebois <kibi@debian.org> Tue, 25 Jan 2011 22:53:45 +0000
+
mesa (7.10-1) experimental; urgency=low
* New upstream release.
diff --git a/debian/not-installed b/debian/not-installed
index 47ff8af..48f257b 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,5 +1,7 @@
# Keep track of files we don't install:
-NOT_INSTALLED = \
+
+# Common list:
+NOT_INSTALLED := \
dri/usr/include/GL/glfbdev.h \
dri/usr/include/GL/glu.h \
dri/usr/include/GL/glu_mangle.h \
@@ -23,3 +25,20 @@ NOT_INSTALLED = \
usr/include/GL/vms_x_fix.h \
usr/include/GL/wglext.h \
usr/include/GL/wmesa.h
+
+# Architecture-specific additional files:
+NOT_INSTALLED_i386 = \
+ usr/lib/i686/cmov/libGL.so \
+ usr/lib/i686/cmov/libGLw.so.1 \
+ usr/lib/i686/cmov/libGLw.so \
+ usr/lib/i686/cmov/libGLU.so \
+ usr/lib/i686/cmov/libGLU.so.1.3.071000 \
+ usr/lib/i686/cmov/libGLw.so.1.0.0 \
+ usr/lib/i686/cmov/libGLU.so.1 \
+ usr/lib/i686/cmov/pkgconfig/glw.pc \
+ usr/lib/i686/cmov/pkgconfig/glu.pc \
+ usr/lib/i686/cmov/pkgconfig/gl.pc \
+
+# Detect the current architecture and add the files if any:
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+NOT_INSTALLED += $(NOT_INSTALLED_$(DEB_HOST_ARCH))
Reply to: