[SCM] Amarok packaging branch, master, updated. debian/2.8.0-4-7-geddb02c

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/amarok.git;a=commitdiff;h=5928e65

The following commit has been merged in the master branch:
commit 5928e65a7bcdf903d36478ace9708342f45e0bb7
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jun 7 18:23:33 2016 +0200

    remove amarok-dbg in favour of -dbgsym packages
---
 debian/changelog |  1 +
 debian/control   | 13 -------------
 debian/rules     |  5 ++++-
 3 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 10360ee..ebe6c4f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ amarok (2.8.0-5) UNRELEASED; urgency=medium
   [ Pino Toscano ]
   * Drop menu file and its pixmaps, since amarok already provides a .desktop
     file.
+  * Remove amarok-dbg in favour of the -dbgsym packages.
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 24 Jan 2016 16:19:34 +0100
 
diff --git a/debian/control b/debian/control
index 97c694d..31d89d1 100644
--- a/debian/control
+++ b/debian/control
@@ -100,16 +100,3 @@ Description: utilities for Amarok media player
      to/from media files required for embedded "Amarok File Tracking".
    - amzdownloader - easily download your files from Amazon if you have their
      references in an encrypted .amz file.
-
-Package: amarok-dbg
-Priority: extra
-Section: debug
-Architecture: any
-Depends: amarok (= ${binary:Version}), ${misc:Depends}
-Recommends: kdelibs5-dbg
-Suggests: libqtwebkit4-dbg
-Description: debugging symbols for Amarok
- This package provides debugging symbols for all binary packages built from
- amarok source package. It's highly recommended to have this package installed
- before reporting any Amarok crashes to either Amarok developers or Debian
- package maintainers.
diff --git a/debian/rules b/debian/rules
index f104c6a..37fcd6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,9 @@ override_dh_install:
 	    cp -a /usr/share/mysql/english/errmsg.sys debian/amarok-common/usr/share/kde4/apps/amarok/mysqle/; \
 	fi
 
+override_dh_strip:
+	dh_strip --dbgsym-migration='amarok-dbg (<< 2.8.0-5~)'
+
 override_dh_makeshlibs:
 	dh_makeshlibs "-Xusr/lib/kde4/*"
 
@@ -27,6 +30,6 @@ override_dh_builddeb:
 	dh_builddeb -- -Zxz
 
 %:
-	dh $@ --with kde --parallel --dbg-package=amarok-dbg
+	dh $@ --with kde --parallel
 
 .PHONY: override_dh_auto_test

-- 
Amarok packaging