[linux-latest] 01/01: Re-introduce xen-linux-system-amd64 *again* as transitional package

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch sid
in repository linux-latest.

commit f5f5c3de621df4d4b1b2f5f1d7b6532b688af838
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Dec 7 00:10:08 2016 +0000

    Re-introduce xen-linux-system-amd64 *again* as transitional package
    
    Closes: #857039
---
 debian/bin/gencontrol.py                            | 4 ----
 debian/changelog                                    | 7 +++++++
 debian/rules.real                                   | 3 ---
 debian/templates/control.extra.in                   | 7 +++++++
 debian/templates/control.xen-linux-system.latest.in | 6 ------
 5 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 012ad7a..e2f0313 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -99,10 +99,6 @@ class Gencontrol(Base):
                 desc.append(config_description['part-long-' + part])
                 desc.append_short(config_description.get('part-short-' + part, ''))
 
-            if self.config.merge('xen', arch, featureset, flavour):
-                makeflags['XEN'] = True
-                templates.extend(self.templates["control.xen-linux-system.latest"])
-
         packages_flavour = []
 
         packages_flavour.append(self.process_real_image(templates[0], image_fields, vars))
diff --git a/debian/changelog b/debian/changelog
index 5a6229d..fa6e810 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+linux-latest (80) UNRELEASED; urgency=medium
+
+  * Re-introduce xen-linux-system-amd64 *again* as transitional package
+    (Closes: #857039)
+
+ -- Ben Hutchings <ben at decadent.org.uk>  Tue, 07 Mar 2017 15:26:58 +0000
+
 linux-latest (79) unstable; urgency=medium
 
   * Update to 4.9.0-2
diff --git a/debian/rules.real b/debian/rules.real
index 7df3de6..7c7cd11 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -58,6 +58,3 @@ install-flavour:
 ifeq ($(DEBUG),True)
 	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-plinux-image$(LOCALVERSION)-dbgsym' GENCONTROL_ARGS='$(GENCONTROL_ARGS) -DAuto-Built-Package=debug-symbols'
 endif
-ifeq ($(XEN),True)
-	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-pxen-linux-system$(LOCALVERSION)'
-endif
diff --git a/debian/templates/control.extra.in b/debian/templates/control.extra.in
index 4ef4175..3c7ba5a 100644
--- a/debian/templates/control.extra.in
+++ b/debian/templates/control.extra.in
@@ -54,3 +54,10 @@ Depends: linux-headers-marvell, ${misc:Depends}
 Description: Header files for Linux orion5x configuration (dummy package)
  This is a dummy transitional package.  It can be safely removed.
 
+Package: xen-linux-system-amd64
+Section: oldlibs
+Priority: extra
+Architecture: amd64
+Depends: xen-system-amd64, linux-image-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.
diff --git a/debian/templates/control.xen-linux-system.latest.in b/debian/templates/control.xen-linux-system.latest.in
deleted file mode 100644
index 2bc0f75..0000000
--- a/debian/templates/control.xen-linux-system.latest.in
+++ /dev/null
@@ -1,6 +0,0 @@
-Package: xen-linux-system at localversion@
-Depends: xen-linux-system- at abiname@@localversion@, ${misc:Depends}
-Provides: xen-linux-system
-Description: Xen system with Linux for @class@ (meta-package)
- This package depends on the Xen hypervisor and the latest Linux kernel
- @flavour@ configuration.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux-latest.git