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

[Ben Hutchings]

Author: benh
Date: Sat Aug 28 17:08:25 2010
New Revision: 16192

Log:
Add bug presubj message for image meta packages directing users to the real image packages

Added:
   dists/sid/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in
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	Sat Aug 28 01:29:55 2010	(r16191)
+++ dists/sid/linux-latest-2.6/debian/bin/gencontrol.py	Sat Aug 28 17:08:25 2010	(r16192)
@@ -94,6 +94,12 @@
         cmds_binary_arch += ["$(MAKE) -f debian/rules.real install-dummy DH_OPTIONS='%s' %s" % (' '.join(["-p%s" % i['Package'] for i in packages_dummy]), makeflags)]
         makefile.add('binary-arch_%s_%s_%s_real' % (arch, featureset, flavour), cmds = cmds_binary_arch)
 
+        for i in packages_dummy:
+            if i['Package'].startswith('linux-image-'):
+                bug_presubj = self.substitute(
+                    self.templates["bug-presubj.image.latest"], vars)
+                file("debian/%s.bug-presubj" % i['Package'], 'w').write(bug_presubj)
+
     def do_extra(self, packages, makefile):
         templates_extra = self.templates["control.extra"]
 

Modified: dists/sid/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/sid/linux-latest-2.6/debian/changelog	Sat Aug 28 01:29:55 2010	(r16191)
+++ dists/sid/linux-latest-2.6/debian/changelog	Sat Aug 28 17:08:25 2010	(r16192)
@@ -1,6 +1,8 @@
 linux-latest-2.6 (29) UNRELEASED; urgency=low
 
   * Add xen-linux-system-2.6-* meta-packages (Closes: #402414)
+  * Add bug presubj message for image meta packages directing users to the
+    real image packages
 
  -- Ben Hutchings <ben at decadent.org.uk>  Sun, 01 Aug 2010 23:24:48 +0100
 

Modified: dists/sid/linux-latest-2.6/debian/rules.real
==============================================================================
--- dists/sid/linux-latest-2.6/debian/rules.real	Sat Aug 28 01:29:55 2010	(r16191)
+++ dists/sid/linux-latest-2.6/debian/rules.real	Sat Aug 28 17:08:25 2010	(r16192)
@@ -13,6 +13,7 @@
 binary-indep: install-tools
 
 install-base:
+	dh_bugfiles
 	dh_installchangelogs
 	dh_installdocs
 	dh_compress

Added: dists/sid/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ dists/sid/linux-latest-2.6/debian/templates/bug-presubj.image.latest.in	Sat Aug 28 17:08:25 2010	(r16192)
@@ -0,0 +1,5 @@
+You are about to report a bug in a Linux kernel meta package.
+This is probably not what you intended to do.
+
+If you want to report a bug in the Linux kernel or modules, you should use
+the package name linux-image- at upstreamversion@@abiname@@localversion@ instead.