[linux-latest] 01/02: Revert changes to debug symbol meta-packages

[debian-kernel at lists.debian.org]

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

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

commit de355e0edd12418989aa66bd45d2c402ec30cac1
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Sat Oct 1 23:23:38 2016 +0100

    Revert changes to debug symbol meta-packages
    
    This reverts commit 33486045a16dbe9118bb37fcae85673f93e537a2.
    New-style dbgsym packages are not properly supported in
    jessie-backports and I've reverted the corresponding changes in the
    backport of linux.
---
 debian/bin/gencontrol.py                        | 2 +-
 debian/changelog                                | 1 +
 debian/rules.real                               | 2 +-
 debian/templates/control.image-dbg.latest.in    | 8 +++-----
 debian/templates/lintian-overrides.image-dbg.in | 4 ++--
 debian/templates/lintian-overrides.source.in    | 2 +-
 6 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 5e3241b..15c1b11 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -81,7 +81,7 @@ class Gencontrol(Base):
             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 96421fd..fa6a958 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ linux-latest (75~bpo8+1) UNRELEASED; urgency=medium
 
   * Rebuild for jessie-backports:
     - ABI version is 0.bpo.1, not 1
+    - Revert changes to debug symbol meta-packages
 
  -- Ben Hutchings <ben at decadent.org.uk>  Fri, 30 Sep 2016 22:12:01 +0200
 
diff --git a/debian/rules.real b/debian/rules.real
index 7c7cd11..5f17a23 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -56,5 +56,5 @@ install-flavour:
 	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 72e93c6..98f1bfb 100644
--- a/debian/templates/control.image-dbg.latest.in
+++ b/debian/templates/control.image-dbg.latest.in
@@ -1,8 +1,6 @@
-Package: linux-image at localversion@-dbgsym
-Depends: linux-image- at abiname@@localversion at -dbgsym, ${misc:Depends}
+Package: linux-image at localversion@-dbg
+Depends: linux-image- at abiname@@localversion at -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 b7378c2..efebf21 100644
--- a/debian/templates/lintian-overrides.image-dbg.in
+++ b/debian/templates/lintian-overrides.image-dbg.in
@@ -1,2 +1,2 @@
-linux-image- at flavour@-dbgsym: wrong-section-according-to-package-name linux-image- at flavour@-dbgsym => debug
-linux-image- at flavour@-dbgsym: debug-package-should-be-priority-extra linux-image- at flavour@-dbgsym
+linux-image- at flavour@-dbg: wrong-section-according-to-package-name linux-image- at flavour@-dbg => debug
+linux-image- at flavour@-dbg: debug-package-should-be-priority-extra linux-image- at flavour@-dbg
diff --git a/debian/templates/lintian-overrides.source.in b/debian/templates/lintian-overrides.source.in
index c6b7ca3..15b53f4 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- at flavour@-dbgsym
+linux-latest source: dbg-package-missing-depends linux-image- at flavour@-dbg

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