[Pkg-fglrx-devel] r1042 - in fglrx-driver/trunk/debian: . module

[Andreas Beckmann]

Author: anbe-guest
Date: 2012-09-10 12:39:39 +0000 (Mon, 10 Sep 2012)
New Revision: 1042

Modified:
   fglrx-driver/trunk/debian/changelog
   fglrx-driver/trunk/debian/module/control.template.in
   fglrx-driver/trunk/debian/module/rules.in
Log:
merged r1028 from branches/experimental (Built-Using)

Modified: fglrx-driver/trunk/debian/changelog
===================================================================
--- fglrx-driver/trunk/debian/changelog	2012-09-04 23:20:34 UTC (rev 1041)
+++ fglrx-driver/trunk/debian/changelog	2012-09-10 12:39:39 UTC (rev 1042)
@@ -2,6 +2,9 @@
 
   * fglrx-driver.postrm: Do not fail if the debconf templates are not
     available (i.e. if the package is unconfigured).
+  * fglrx-source: Add Built-Using attribute to the generated module packages
+    to record the exact versions of linux and fglrx-driver that were used
+    during the build.
 
  -- Andreas Beckmann <debian at abeckmann.de>  Wed, 01 Aug 2012 20:44:03 +0200
 

Modified: fglrx-driver/trunk/debian/module/control.template.in
===================================================================
--- fglrx-driver/trunk/debian/module/control.template.in	2012-09-04 23:20:34 UTC (rev 1041)
+++ fglrx-driver/trunk/debian/module/control.template.in	2012-09-10 12:39:39 UTC (rev 1042)
@@ -24,6 +24,9 @@
  fglrx-module-#KVERS#,
 Replaces:
  fglrx-module-#KVERS#,
+Built-Using:
+ ${built:using:kernel},
+ ${built:using:fglrx},
 Description: FGLRX binary kernel module for Linux #KVERS#
  FGLRX / AMD Catalyst is the non-free proprietary display driver for the
  ATI/AMD RadeonHD and FireGL graphics cards. As an alternative, you may try

Modified: fglrx-driver/trunk/debian/module/rules.in
===================================================================
--- fglrx-driver/trunk/debian/module/rules.in	2012-09-04 23:20:34 UTC (rev 1041)
+++ fglrx-driver/trunk/debian/module/rules.in	2012-09-10 12:39:39 UTC (rev 1042)
@@ -54,6 +54,8 @@
 	dh_prep
 	$(MAKE) -C $(KSRC) SUBDIRS=$(CURDIR) modules
 
+get_built_using	?= $(filter-out (=),$(shell dpkg-query -f='$${source:Package} (=$${source:Version})' -W $1))
+
 binary_modules: build
 	dh_testdir
 	dh_testroot
@@ -69,7 +71,10 @@
 	dh_compress
 	dh_fixperms
 	dh_installdeb
-	dh_gencontrol -- -v$(PKG_VERSION) -V'fglrx:Version=$(subst ~,-,$(upstream_version))'
+	dh_gencontrol -- -v$(PKG_VERSION) \
+		-V'fglrx:Version=$(subst ~,-,$(upstream_version))' \
+		-V'built:using:kernel=$(call get_built_using,linux-headers-$(KVERS))' \
+		-V'built:using:fglrx=$(call get_built_using,_FGLRX_-source)'
 	dh_md5sums
 ifdef KPKG_DEST_DIR
 	dh_builddeb --destdir=$(KPKG_DEST_DIR)