From 6d39ffde84bffc65eff6e0b7184a816138853762 Mon Sep 17 00:00:00 2001
From: Ben Hutchings <ben@decadent.org.uk>
Date: Thu, 14 Jul 2016 11:12:16 +0100
Subject: [PATCH] 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 053754670..776642a04 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 d6136e37c..2921764fe 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 bd0b36d44..7c4125ce2 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 39cbe9c86..c3c8d636a 100644
--- a/debian/templates/control.image-dbg.in
+++ b/debian/templates/control.image-dbg.in
@@ -1,8 +1,6 @@
-Package: linux-image-@abiname@@localversion@-dbg
+Package: linux-image-@abiname@@localversion@-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-@abiname@@localversion@.
+Description: Debug symbols for linux-image-@abiname@@localversion@
diff --git a/debian/templates/image-dbg.lintian-override.in b/debian/templates/image-dbg.lintian-override.in
index 3e1849d74..26c857a6a 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-@abiname@@localversion@-dbg: dbg-package-missing-depends
+linux-image-@abiname@@localversion@-dbgsym: dbg-package-missing-depends