[linux-latest] 04/07: Rename and move debug symbol meta-packages to the debug archive

[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 33486045a16dbe9118bb37fcae85673f93e537a2
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Wed Aug 31 02:21:30 2016 +0100

    Rename and move debug symbol meta-packages to the debug archive
---
 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, 11 insertions(+), 8 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 15c1b11..5e3241b 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-dbg.lintian-overrides' %
+                            'debian/linux-image-%s-dbgsym.lintian-overrides' %
                             vars['flavour'])
             substitute_file('lintian-overrides.source',
                             'debian/source.lintian-overrides',
diff --git a/debian/changelog b/debian/changelog
index 257b6ab..c99c02f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 linux-latest (75) UNRELEASED; urgency=medium
 
   * Update to 4.7.0-1
+  * Rename and move debug symbol meta-packages to the debug archive
 
  -- Ben Hutchings <ben at decadent.org.uk>  Wed, 31 Aug 2016 01:35:01 +0100
 
diff --git a/debian/rules.real b/debian/rules.real
index 5f17a23..7c7cd11 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)-dbg'
+	$(MAKE) -f debian/rules.real install-base DH_OPTIONS='-plinux-image$(LOCALVERSION)-dbgsym' GENCONTROL_ARGS='$(GENCONTROL_ARGS) -DAuto-Built-Package=debug-symbols'
 endif
diff --git a/debian/templates/control.image-dbg.latest.in b/debian/templates/control.image-dbg.latest.in
index 98f1bfb..72e93c6 100644
--- a/debian/templates/control.image-dbg.latest.in
+++ b/debian/templates/control.image-dbg.latest.in
@@ -1,6 +1,8 @@
-Package: linux-image at localversion@-dbg
-Depends: linux-image- at abiname@@localversion at -dbg, ${misc:Depends}
+Package: linux-image at localversion@-dbgsym
+Depends: linux-image- at abiname@@localversion at -dbgsym, ${misc:Depends}
 Provides: linux-latest-image-dbg
-Description: Debugging symbols for Linux @flavour@ configuration (meta-package)
+Section: debug
+Priority: extra
+Description: Debug 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 efebf21..b7378c2 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@-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
+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
diff --git a/debian/templates/lintian-overrides.source.in b/debian/templates/lintian-overrides.source.in
index 15b53f4..c6b7ca3 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@-dbg
+linux-latest source: dbg-package-missing-depends linux-image- at flavour@-dbgsym

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