Bug#866692: stretch-pu: package linux-latest/80+deb9u1

[Ben Hutchings <ben@decadent.org.uk>]

Package: release.debian.org
Severity: normal
Tags: stretch
User: release.debian.org@packages.debian.org
Usertags: pu

src:linux-latest builds meta-packages depending on debug info packages
built from src:linux.  During the stretch release cycle, these were
changed to new-style dbgsym packages and then this change was reverted
to src:linux.  However, the change in src:linux-latest was *not*
reverted, leaving these meta-packages uninstallable.

The source changes are shown below, not including the files generated by
deian/bin/gencontrol.py.

Ben.

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index e2f031342b87..d2f87b9c6210 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -81,7 +81,7 @@ import os.path, re, codecs
             makeflags['DEBUG'] = True
             templates.extend(self.templates["control.image-dbg.latest"])
             substitute_file('lintian-overrides.image-dbg',
-                            'debian/linux-image-%s-dbgsym.lintian-overrides' %
+                            'debian/linux-image-%s-dbg.lintian-overrides' %
                             vars['flavour'])
             substitute_file('lintian-overrides.source',
                             'debian/source.lintian-overrides',
diff --git a/debian/changelog b/debian/changelog
index 867142c4a7d4..bd4e74d9f38d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+linux-latest (80+deb9u1) stretch; urgency=medium
+
+  * Revert changes to debug symbol meta-packages (Closes: #866691)
+
+ -- Ben Hutchings <ben@decadent.org.uk>  Sat, 01 Jul 2017 01:31:49 +0100
+
 linux-latest (80) unstable; urgency=medium
 
   * Re-introduce xen-linux-system-amd64 *again* as transitional package
diff --git a/debian/rules.real b/debian/rules.real
index 7c7cd11d50cb..5f17a23784f6 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -56,5 +56,5 @@ install-perf: DH_OPTIONS = -p$(PACKAGE_NAME)
 	dh_testroot
 	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-plinux-image$(LOCALVERSION) -plinux-headers$(LOCALVERSION)'
 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'
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-plinux-image$(LOCALVERSION)-dbg'
 endif
diff --git a/debian/templates/control.image-dbg.latest.in b/debian/templates/control.image-dbg.latest.in
index 72e93c663675..98f1bfbc965b 100644
--- a/debian/templates/control.image-dbg.latest.in
+++ b/debian/templates/control.image-dbg.latest.in
@@ -1,8 +1,6 @@
-Package: linux-image@localversion@-dbgsym
-Depends: linux-image-@abiname@@localversion@-dbgsym, ${misc:Depends}
+Package: linux-image@localversion@-dbg
+Depends: linux-image-@abiname@@localversion@-dbg, ${misc:Depends}
 Provides: linux-latest-image-dbg
-Section: debug
-Priority: extra
-Description: Debug symbols for Linux @flavour@ configuration (meta-package)
+Description: Debugging symbols for Linux @flavour@ configuration (meta-package)
  This package depends on the detached debugging symbols for the latest
  Linux kernel @flavour@ configuration.
diff --git a/debian/templates/lintian-overrides.image-dbg.in b/debian/templates/lintian-overrides.image-dbg.in
index b7378c2863ab..efebf21cce88 100644
--- a/debian/templates/lintian-overrides.image-dbg.in
+++ b/debian/templates/lintian-overrides.image-dbg.in
@@ -1,2 +1,2 @@
-linux-image-@flavour@-dbgsym: wrong-section-according-to-package-name linux-image-@flavour@-dbgsym => debug
-linux-image-@flavour@-dbgsym: debug-package-should-be-priority-extra linux-image-@flavour@-dbgsym
+linux-image-@flavour@-dbg: wrong-section-according-to-package-name linux-image-@flavour@-dbg => debug
+linux-image-@flavour@-dbg: debug-package-should-be-priority-extra linux-image-@flavour@-dbg
diff --git a/debian/templates/lintian-overrides.source.in b/debian/templates/lintian-overrides.source.in
index c6b7ca34676b..15b53f46915d 100644
--- a/debian/templates/lintian-overrides.source.in
+++ b/debian/templates/lintian-overrides.source.in
@@ -1 +1 @@
-linux-latest source: dbg-package-missing-depends linux-image-@flavour@-dbgsym
+linux-latest source: dbg-package-missing-depends linux-image-@flavour@-dbg


-- System Information:
Debian Release: 9.0
  APT prefers unstable-debug
  APT policy: (500, 'unstable-debug'), (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.11.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8), LANGUAGE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)