[SCM] KDE Discover packaging branch, master, updated. 354988eb04e7a3f44e53f8ae0260864c11cdda65

[Matthias Klumpp]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-discover.git;a=commitdiff;h=31f9988

The following commit has been merged in the master branch:
commit 31f9988ed5c37ddfc45a4e60bdb001a6329985bc
Author: Matthias Klumpp <mak at debian.org>
Date:   Mon Jan 11 23:36:50 2016 +0100

    debian/rules: Make transitional packages get the right version number
---
 debian/rules | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/debian/rules b/debian/rules
index 26e8f59..d0ec15e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,9 +3,7 @@
 include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
-override_dh_strip:
-	$(overridden_command) --dbg-package=discover-dbg
+DEB_VERSION_UPSTREAM_REVISION := $(shell dpkg-parsechangelog | awk '/^Version: / { print $$2 }' | sed -e 's/^[0-9]*://')
 
 # Do not pull plugins into the shlibs file, it makes lintian angry.
 # This happens because dh_makeshlibs will look for sonames matching
@@ -14,8 +12,17 @@ override_dh_strip:
 # 'backend' which makes for bogus, pointless, silly shlibs entries.
 # Couldn't be bothered to report this - sitter, 2015
 override_dh_makeshlibs:
-	$(overridden_command) -Xusr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/discover* -V
+	dh_makeshlibs -Xusr/lib/$(DEB_HOST_MULTIARCH)/qt5/plugins/discover* -V
+
+override_dh_gencontrol:
+	dh_gencontrol -pmuon-discover -- -v4:$(DEB_VERSION_UPSTREAM_REVISION)
+	dh_gencontrol -pmuon-updater -- -v4:$(DEB_VERSION_UPSTREAM_REVISION)
+	dh_gencontrol -pmuon-notifier -- -v4:$(DEB_VERSION_UPSTREAM_REVISION)
+	dh_gencontrol --remaining-packages
+
+override_dh_install:
+	dh_install --list-missing
 
-# FIXME: tests are broken at this time
+# FIXME: tests are broken at time
 override_dh_auto_test:
 	:

-- 
KDE Discover packaging