[kernel] r15952 - in dists/sid/linux-latest-2.6/debian: . bin

[Ben Hutchings]

Author: benh
Date: Tue Jul  6 00:21:23 2010
New Revision: 15952

Log:
Change binary-indep versions to match binary-arch versions

This unfortunately requires adding an epoch to the linux-doc-2.6 and
linux-source-2.6 packages.

Modified:
   dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
   dists/sid/linux-latest-2.6/debian/changelog
   dists/sid/linux-latest-2.6/debian/rules.real

Modified: dists/sid/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Tue Jul  6 00:02:44 2010	(r15951)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Tue Jul  6 00:21:23 2010	(r15952)
@@ -26,6 +26,9 @@
         changelog_version = Changelog()[0].version
         self.package_version = '%s+%s' % (self.version.upstream, changelog_version.complete)
 
+    def do_main_setup(self, vars, makeflags, extra):
+        makeflags['GENCONTROL_ARGS'] = '-v%s' % self.package_version
+
     def do_main_packages(self, packages, vars, makeflags, extra):
         packages['source']['Build-Depends'].extend(
             ['linux-support-%s%s' % (self.version.linux_upstream, self.abiname)]

Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog	Tue Jul  6 00:02:44 2010	(r15951)
+++ dists/sid/linux-latest-2.6/debian/changelog	Tue Jul  6 00:21:23 2010	(r15952)
@@ -3,6 +3,8 @@
   * Move NEWS from linux-2.6, since apt-listchanges only shows it for
     upgraded packages
   * Add linux-tools-2.6 meta package
+  * Change versions for linux-doc-2.6 and linux-source-2.6 to match those
+    of the other meta packages
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 20 Jun 2010 18:02:34 +0100
 

Modified: dists/sid/linux-latest-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.real	Tue Jul  6 00:02:44 2010	(r15951)
+++ dists/sid/linux-latest-2.6/debian/rules.real	Tue Jul  6 00:21:23 2010	(r15952)
@@ -32,13 +32,13 @@
 install-doc: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-doc:
 	dh_prep
-	$(MAKE) -f debian/rules.real install-base
+	$(MAKE) -f debian/rules.real install-base GENCONTROL_ARGS=$(patsubst -v%,-v1:%,$(GENCONTROL_ARGS))
 
 install-source: PACKAGE_NAME = linux-source-2.6
 install-source: DH_OPTIONS = -p$(PACKAGE_NAME)
 install-source:
 	dh_prep
-	$(MAKE) -f debian/rules.real install-base
+	$(MAKE) -f debian/rules.real install-base GENCONTROL_ARGS=$(patsubst -v%,-v1:%,$(GENCONTROL_ARGS))
 
 install-tools: PACKAGE_NAME = linux-tools-2.6
 install-tools: DH_OPTIONS = -p$(PACKAGE_NAME)