[Pkg-fglrx-devel] r700 - fglrx-driver/branches/multiarch/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-08 22:00:24 +0000 (Mon, 08 Aug 2011)
New Revision: 700

Modified:
   fglrx-driver/branches/multiarch/debian/changelog
   fglrx-driver/branches/multiarch/debian/compat
   fglrx-driver/branches/multiarch/debian/control
   fglrx-driver/branches/multiarch/debian/rules
Log:
enable multiarch build

Modified: fglrx-driver/branches/multiarch/debian/changelog
===================================================================
--- fglrx-driver/branches/multiarch/debian/changelog	2011-08-08 21:30:48 UTC (rev 699)
+++ fglrx-driver/branches/multiarch/debian/changelog	2011-08-08 22:00:24 UTC (rev 700)
@@ -3,9 +3,11 @@
   [ Andreas Beckmann ]
   * Add more copyright statements and licenses to debian/copyright.
   * Let dh_installmodules handle the modprobe blacklist config.
-  * Prepare multiarch support.
+  * Enable multiarch build.
     - Add and use _LIBDIR_ substitution variable.
     - Add Pre-Depends: ${misc:Pre-Depends}.
+    - Add Multi-Arch: same.
+    - Bump debhelper compat level to 9.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Mon, 08 Aug 2011 17:54:32 +0200
 

Modified: fglrx-driver/branches/multiarch/debian/compat
===================================================================
--- fglrx-driver/branches/multiarch/debian/compat	2011-08-08 21:30:48 UTC (rev 699)
+++ fglrx-driver/branches/multiarch/debian/compat	2011-08-08 22:00:24 UTC (rev 700)
@@ -1 +1 @@
-8
+9

Modified: fglrx-driver/branches/multiarch/debian/control
===================================================================
--- fglrx-driver/branches/multiarch/debian/control	2011-08-08 21:30:48 UTC (rev 699)
+++ fglrx-driver/branches/multiarch/debian/control	2011-08-08 22:00:24 UTC (rev 700)
@@ -28,6 +28,7 @@
 
 Package: fglrx-driver
 Architecture: i386 amd64
+Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:
@@ -65,6 +66,7 @@
 
 Package: fglrx-glx
 Architecture: i386 amd64
+Multi-Arch: same
 Pre-Depends:
  ${misc:Pre-Depends},
 Depends:

Modified: fglrx-driver/branches/multiarch/debian/rules
===================================================================
--- fglrx-driver/branches/multiarch/debian/rules	2011-08-08 21:30:48 UTC (rev 699)
+++ fglrx-driver/branches/multiarch/debian/rules	2011-08-08 22:00:24 UTC (rev 700)
@@ -16,7 +16,7 @@
 lib=lib
 endif
 
-#MULTIARCH	?= yes
+MULTIARCH	?= yes
 libdir		 = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
 
 generated=$(shell ls debian/*.in | sed s/\.in$$//g)