Make libgl1-mesa-dev and mesa-common-dev 'Architecture: any'.

This gets rid of uninstallability when a new upstream version
isn't built on all architectures, and allows us to ship potentially
arch-specific .pc files.

3 files changed, 14 insertions, 20 deletions

diff --git a/debian/changelog b/debian/changelog
index 902a6d05470..dd2337e5b9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mesa (7.4-3) UNRELEASED; urgency=low
+
+  * Make libgl1-mesa-dev and mesa-common-dev 'Architecture: any'.  This gets
+    rid of uninstallability when a new upstream version isn't built on all
+    architectures, and allows us to ship potentially arch-specific .pc files.
+
+ -- Julien Cristau <[email protected]>  Wed, 15 Apr 2009 19:25:50 +0200
+
 mesa (7.4-2) unstable; urgency=low
 
   * Upload to unstable.
diff --git a/debian/control b/debian/control
index c3f36f4e58d..97ef61e7c73 100644
--- a/debian/control
+++ b/debian/control
@@ -89,7 +89,7 @@ Package: libgl1-mesa-swx11-dev
 Section: libdevel
 Priority: extra
 Architecture: any
-Depends: libgl1-mesa-swx11 (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${source:Version})
+Depends: libgl1-mesa-swx11 (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${binary:Version})
 Provides: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
 Conflicts: mesa-dev, libgl-dev, mesag3 (<< 3.1-1), nvidia-glx-dev, mesag-dev, libgl1-mesa-swrast-dev
 Replaces: libgl-dev, mesag-dev, libgl1-mesa-swrast-dev
@@ -222,8 +222,8 @@ Description: Debugging symbols for the Mesa DRI modules
 
 Package: libgl1-mesa-dev
 Section: libdevel
-Architecture: all
-Depends: libc6-dev, mesa-common-dev (= ${source:Version}), libgl1-mesa-glx (>= ${source:Upstream-Version})
+Architecture: any
+Depends: libc6-dev, mesa-common-dev (= ${binary:Version}), libgl1-mesa-glx (= ${binary:Version})
 Conflicts: libgl-dev, libgl1-mesa-dri-dev
 Replaces: libgl-dev, libgl1-mesa-dri-dev
 Provides: libgl-dev, libgl1-mesa-dri-dev
@@ -240,7 +240,7 @@ Description: A free implementation of the OpenGL API -- GLX development files
 
 Package: mesa-common-dev
 Section: libdevel
-Architecture: all
+Architecture: any
 Replaces: xlibmesa-gl-dev (<< 1:7), xlibosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), libgl1-mesa-dev (<< 6.5.2)
 Depends: libx11-dev
 Description: Developer documentation for Mesa
@@ -264,7 +264,7 @@ Description: Mesa Off-screen rendering extension
 Package: libosmesa6-dev
 Section: libdevel
 Architecture: any
-Depends: libosmesa6 (= ${binary:Version}), mesa-common-dev (= ${source:Version}) | libgl-dev
+Depends: libosmesa6 (= ${binary:Version}), mesa-common-dev (= ${binary:Version}) | libgl-dev
 Conflicts: xlibosmesa-dev, libosmesa4-dev, libosmesa-dev
 Replaces: xlibosmesa-dev, libosmesa-dev, libgl1-mesa-swx11-dev (<< 6.5.2), mesa-common-dev (<< 6.5.2)
 Provides: xlibosmesa-dev, libosmesa-dev
@@ -329,7 +329,7 @@ Description: A free implementation of the OpenGL API -- runtime
 Package: libglw1-mesa-dev
 Section: libdevel
 Architecture: any
-Depends: libglw1-mesa (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${source:Version})
+Depends: libglw1-mesa (= ${binary:Version}), libc6-dev, libx11-dev, libxext6, mesa-common-dev (= ${binary:Version})
 Provides: mesag3-widgets, mesag-widgets-dev, libglw-dev
 Conflicts: libglw-dev, libgl1-mesa-swx11-dev (<< 6.5.2-4)
 Replaces: libglw-dev
diff --git a/debian/rules b/debian/rules
index 1583dac02ef..a73b4da8750 100755
--- a/debian/rules
+++ b/debian/rules
@@ -207,20 +207,6 @@ clean: unpatch
 
 # Build architecture-independent files here.
 binary-indep: install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_install --sourcedir=debian/tmp --list-missing -i
-	dh_installman -i
-	dh_link -i
-	dh_compress -i
-	dh_fixperms -i
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
 
 # Build architecture-dependent files here.
 binary-arch: install