[linux] 03/03: Change names and descriptions of debug symbol packages to match debhelper

[debian-kernel at lists.debian.org]

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

benh pushed a commit to branch master
in repository linux.

commit 6d39ffde84bffc65eff6e0b7184a816138853762
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Thu Jul 14 11:12:16 2016 +0100

    Change names and descriptions of debug symbol packages to match debhelper
---
 debian/bin/gencontrol.py                       | 2 +-
 debian/changelog                               | 2 ++
 debian/rules.real                              | 2 +-
 debian/templates/control.image-dbg.in          | 6 ++----
 debian/templates/image-dbg.lintian-override.in | 2 +-
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/bin/gencontrol.py b/debian/bin/gencontrol.py
index 0537546..776642a 100755
--- a/debian/bin/gencontrol.py
+++ b/debian/bin/gencontrol.py
@@ -497,7 +497,7 @@ class Gencontrol(Base):
                                   'debian/%s.%s' % (image_main['Package'], name))
         if build_debug:
             self._substitute_file('image-dbg.lintian-override', vars,
-                                  'debian/linux-image-%s%s-dbg.lintian-overrides' %
+                                  'debian/linux-image-%s%s-dbgsym.lintian-overrides' %
                                   (vars['abiname'], vars['localversion']))
 
     def process_changelog(self):
diff --git a/debian/changelog b/debian/changelog
index d6136e3..2921764 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -19,6 +19,8 @@ linux (4.7~rc7-1~exp1) UNRELEASED; urgency=medium
     doesn't like to see it in debian/control
   * debian/lib/python/debian_linux/debian.py: Handle packages with only short
     descriptions
+  * Change names and descriptions of linux-image debug symbol packages to match
+    debhelper
 
   [ Bastian Blank ]
   * Mark debug symbols packages to move them into the debug archive.
diff --git a/debian/rules.real b/debian/rules.real
index bd0b36d..7c4125c 100644
--- a/debian/rules.real
+++ b/debian/rules.real
@@ -426,7 +426,7 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_bug:
 	printf "RELEASE='$(REAL_VERSION)'\nDISTRIBUTOR='$(DISTRIBUTOR)'\nSOURCEVERSION='$(SOURCEVERSION)'\nPACKAGE_NAME='$(PACKAGE_NAME)'\nPACKAGE_VERSION='$(SOURCEVERSION)'" > $(PACKAGE_DIR)/usr/share/bug/$(PACKAGE_NAME)/info
 
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): REAL_VERSION = $(ABINAME)$(LOCALVERSION)
-install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-image-$(REAL_VERSION)-dbg
+install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_NAME = linux-image-$(REAL_VERSION)-dbgsym
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): PACKAGE_DIR = debian/$(PACKAGE_NAME)
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DEBUG_DIR = $(PACKAGE_DIR)/usr/lib/debug
 install-image-dbg_$(ARCH)_$(FEATURESET)_$(FLAVOUR): DIR = $(BUILD_DIR)/build_$(ARCH)_$(FEATURESET)_$(FLAVOUR)
diff --git a/debian/templates/control.image-dbg.in b/debian/templates/control.image-dbg.in
index 39cbe9c..c3c8d63 100644
--- a/debian/templates/control.image-dbg.in
+++ b/debian/templates/control.image-dbg.in
@@ -1,8 +1,6 @@
-Package: linux-image- at abiname@@localversion at -dbg
+Package: linux-image- at abiname@@localversion at -dbgsym
 Build-Profiles: <!stage1>
 Depends: ${misc:Depends}
 Section: debug
 Priority: extra
-Description: Debugging symbols for Linux @abiname@@localversion@
- This package provides the detached debugging symbols for the Linux kernel
- and modules in linux-image- at abiname@@localversion at .
+Description: Debug symbols for linux-image- at abiname@@localversion@
diff --git a/debian/templates/image-dbg.lintian-override.in b/debian/templates/image-dbg.lintian-override.in
index 3e1849d..26c857a 100644
--- a/debian/templates/image-dbg.lintian-override.in
+++ b/debian/templates/image-dbg.lintian-override.in
@@ -1,2 +1,2 @@
 # Kernel dbg packages contain a full image with debug data
-linux-image- at abiname@@localversion at -dbg: dbg-package-missing-depends
+linux-image- at abiname@@localversion at -dbgsym: dbg-package-missing-depends

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