[Pkg-fglrx-devel] r758 - fglrx-driver/trunk/debian

[Andreas Beckmann]

Author: anbe-guest
Date: 2011-08-31 22:08:03 +0000 (Wed, 31 Aug 2011)
New Revision: 758

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

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2011-08-31 21:45:09 UTC (rev 757)
+++ fglrx-driver/trunk/debian/changelog	2011-08-31 22:08:03 UTC (rev 758)
@@ -5,6 +5,11 @@
     compatibility symlink.
   * Install a list of supported PCI IDs as /usr/share/fglrx/fglrx.ids.
   * Cleanup maintainer scripts.
+  * Enable multiarch build.
+    - Add and use _LIBDIR_ substitution variable.
+    - Add Pre-Depends: ${misc:Pre-Depends}.
+    - Add Multi-Arch: same.
+    - Bump debhelper dependency to 8.1.3 and compat level to 9.
   * Override the experimental lintian tag shlib-calls-exit.
   * Prepare support for squeeze-backports:
     - Add instructions for squeeze-backports to README.source and a

Modified: fglrx-driver/trunk/debian/compat
===================================================================
--- fglrx-driver/trunk/debian/compat	2011-08-31 21:45:09 UTC (rev 757)
+++ fglrx-driver/trunk/debian/compat	2011-08-31 22:08:03 UTC (rev 758)
@@ -1 +1 @@
-8
+9

Modified: fglrx-driver/trunk/debian/control
===================================================================
--- fglrx-driver/trunk/debian/control	2011-08-31 21:45:09 UTC (rev 757)
+++ fglrx-driver/trunk/debian/control	2011-08-31 22:08:03 UTC (rev 758)
@@ -5,7 +5,7 @@
 Uploaders: Patrick Matthäi <pmatthaei at debian.org>,
  Michael Gilbert <michael.s.gilbert at gmail.com>
 Build-Depends:
- debhelper (>= 8.1.0~),
+ debhelper (>= 8.1.3),
  bzip2,
  ia32-libs [amd64],
  libxrandr2,

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2011-08-31 21:45:09 UTC (rev 757)
+++ fglrx-driver/trunk/debian/rules	2011-08-31 22:08:03 UTC (rev 758)
@@ -16,12 +16,19 @@
 lib=lib
 endif
 
+MULTIARCH	?= yes
+libdir		 = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
+
 generated=$(shell ls debian/*.in | sed s/\.in$$//g)
 generated	+= fglrx.ids
 
 %: %.in
-	sed -e s/_VERSION_/$(upstream_version)/g -e s/_ARCH_/$(arch)/g \
-	    -e s/_XPIC_/$(xpic)/g -e s/_LIB_/$(lib)/g < $< > $@
+	sed -r -e 's%_VERSION_%$(upstream_version)%g' \
+	       -e 's%_ARCH_%$(arch)%g' \
+	       -e 's%_XPIC_%$(xpic)%g' \
+	       -e 's%_LIB_%$(lib)%g' \
+	       -e 's%_LIBDIR_%$(libdir)%g' \
+	       < $< > $@
 
 %:
 	dh $@