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

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-07-08 10:27:27 +0000 (Sun, 08 Jul 2012)
New Revision: 964

Added:
   fglrx-driver/trunk/debian/rules.defs
Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/rules
Log:
add support for variant specific settings in debian/rules.defs

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-07-08 09:40:46 UTC (rev 963)
+++ fglrx-driver/trunk/debian/changelog	2012-07-08 10:27:27 UTC (rev 964)
@@ -4,6 +4,7 @@
   * Fix encoding of cs.po from 2xUTF8 to UTF8.
   * Prepare for co-existence of fglrx-legacy-driver:
    - Add more Provides/Conflicts/Replaces on new virtual packages.
+   - Add support for variant specific settings in debian/rules.defs.
 
   [ Patrick Matthäi ]
   * Use again the signature file from fglrx itself. The imported one is only

Modified: fglrx-driver/trunk/debian/rules
===================================================================
--- fglrx-driver/trunk/debian/rules	2012-07-08 09:40:46 UTC (rev 963)
+++ fglrx-driver/trunk/debian/rules	2012-07-08 10:27:27 UTC (rev 964)
@@ -6,6 +6,9 @@
 DEB_HOST_ARCH		?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 DEB_HOST_MULTIARCH	?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
+include debian/rules.defs
+MULTIARCH	?=
+
 ifeq ($(DEB_HOST_ARCH),amd64)
 arch=x86_64
 xpic=xpic_64a
@@ -18,14 +21,13 @@
 cap=AMDXvBAx86.cap
 endif
 
-MULTIARCH	?= yes
 libdir		 = usr/lib$(if $(MULTIARCH),/$(DEB_HOST_MULTIARCH))
 
 generated=$(shell ls debian/*.in | sed s/\.in$$//g)
 generated	+= fglrx.ids
 generated	+= debian/switchlibglx
 
-%: %.in
+%: %.in debian/rules debian/rules.defs
 	sed -r -e 's%_VERSION_%$(upstream_version)%g' \
 	       -e 's%_ARCH_%$(arch)%g' \
 	       -e 's%_XPIC_%$(xpic)%g' \
@@ -130,7 +132,7 @@
 
 prepare-squeeze-backport:
 	echo 8 > debian/compat
-	sed -i -e '/^MULTIARCH/ s/^/#/' debian/rules
+	sed -i -e '/^MULTIARCH/ s/^/#/' debian/rules.defs
 	sed -i -e 's/debhelper (>= 9.*)/debhelper (>= 8.1.0~)/' \
 	       -e '/^Multi-Arch:/ d' debian/control
 	sed -i -e '/fglrx_dri.so/ s/^/#/' debian/fglrx-driver.links.in

Added: fglrx-driver/trunk/debian/rules.defs
===================================================================
--- fglrx-driver/trunk/debian/rules.defs	                        (rev 0)
+++ fglrx-driver/trunk/debian/rules.defs	2012-07-08 10:27:27 UTC (rev 964)
@@ -0,0 +1 @@
+MULTIARCH	 = yes