[kernel] r17591 - in dists/trunk/linux-latest-2.6/debian: . bin templates

[Ben Hutchings]

Author: benh
Date: Sun Jun  5 04:30:31 2011
New Revision: 17591

Log:
Restore xen-linux-system-<flavour> packages

Modified:
   dists/trunk/linux-latest-2.6/debian/bin/gencontrol.py
   dists/trunk/linux-latest-2.6/debian/changelog
   dists/trunk/linux-latest-2.6/debian/templates/control.extra.in
   dists/trunk/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in

Modified: dists/trunk/linux-latest-2.6/debian/bin/gencontrol.py
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/bin/gencontrol.py	Fri Jun  3 06:06:48 2011	(r17590)
+++ dists/trunk/linux-latest-2.6/debian/bin/gencontrol.py	Sun Jun  5 04:30:31 2011	(r17591)
@@ -66,8 +66,6 @@
             templates.extend(self.templates["control.image.latest.type-modules"])
         else:
             templates.extend(self.templates["control.image.latest.type-standalone"])
-        if featureset == 'xen':
-            templates.extend(self.templates["control.xen-linux-system.latest"])
         if config_base.get('modules', True):
             templates.extend(self.templates["control.headers.latest"])
 
@@ -83,6 +81,9 @@
                 desc.append(config_description['part-long-' + part])
                 desc.append_short(config_description.get('part-short-' + part, ''))
 
+            if 'xen' in desc_parts:
+                templates.extend(self.templates["control.xen-linux-system.latest"])
+
         packages_dummy = []
 
         packages_dummy.append(self.process_real_image(templates[0], image_fields, vars))

Modified: dists/trunk/linux-latest-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/changelog	Fri Jun  3 06:06:48 2011	(r17590)
+++ dists/trunk/linux-latest-2.6/debian/changelog	Sun Jun  5 04:30:31 2011	(r17591)
@@ -1,3 +1,9 @@
+linux-latest-2.6 (37) UNRELEASED; urgency=low
+
+  * Restore xen-linux-system-<flavour> packages
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Sun, 05 Jun 2011 05:29:49 +0100
+
 linux-latest-2.6 (36) experimental; urgency=low
 
   * Update to 3.0.0-rc1

Modified: dists/trunk/linux-latest-2.6/debian/templates/control.extra.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.extra.in	Fri Jun  3 06:06:48 2011	(r17590)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.extra.in	Sun Jun  5 04:30:31 2011	(r17591)
@@ -21,3 +21,15 @@
 Depends: linux-image-686-pae, ${misc:Depends}
 Description: Linux for PCs with 4GB+ RAM (dummy package)
  This is a dummy transitional package.  It can be safely removed.
+
+Package: xen-linux-system-2.6-686
+Architecture: i386
+Depends: xen-linux-system-686-pae, ${misc:Depends}
+Description: Xen system with Linux for modern PCs (dummy package)
+ This is a dummy transitional package.  It can be safely removed.
+
+Package: xen-linux-system-2.6-amd64
+Architecture: amd64
+Depends: xen-linux-system-amd64, ${misc:Depends}
+Description: Xen system with Linux for 64-bit PCs (dummy package)
+ This is a dummy transitional package.  It can be safely removed.

Modified: dists/trunk/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in
==============================================================================
--- dists/trunk/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in	Fri Jun  3 06:06:48 2011	(r17590)
+++ dists/trunk/linux-latest-2.6/debian/templates/control.xen-linux-system.latest.in	Sun Jun  5 04:30:31 2011	(r17591)
@@ -4,8 +4,3 @@
 Description: Xen system with Linux for @class@ (meta-package)
  This package depends on the Xen hypervisor and the latest Linux kernel
  @flavour@ configuration.
-
-Package: xen-linux-system-2.6 at localversion@
-Depends: xen-linux-system at localversion@, ${misc:Depends}
-Description: Xen system with Linux for @class@ (dummy package)
- This is a dummy transitional package.  It can be safely removed.