[SCM] KDE metapackages branch, master, updated. debian/80-14-g9137352

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/meta-kde.git;a=commitdiff;h=edb065e

The following commit has been merged in the master branch:
commit edb065e901dde221f9af67036e555103869dbda9
Author: Pino Toscano <pino at debian.org>
Date:   Mon Sep 9 11:52:04 2013 +0200

    add a way to put "+dfsg" in the package version
    
    ... for metapackages needing it
---
 debian/changelog |    2 ++
 debian/rules     |    5 +++++
 2 files changed, 7 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index df3134f..9612450 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ meta-kde (5:81) UNRELEASED; urgency=low
   * kdeedu: depend on pairs.
   * kdeutils: recommend print-manager.
   * Move the kdeadmin, kdesdk and kdetoys metapackages to this source.
+  * Add a way to put "+dfsg" in the package version, for metapackages needing
+    it.
 
   [ Maximiliano Curia ]
   * debian/control: Aesthetic change, remove trailing space.
diff --git a/debian/rules b/debian/rules
index 559bbfc..a5d63b2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,9 +7,11 @@ DEV_LATEST_VERSION := 4:4.10.5
 DEV_PREV_VERSION := 4:4.7.4
 
 KDE_VERSION_METAPKGS := kdeaccessibility kdeadmin kdeedu kdegames kdegraphics kdegraphics-libs-data kdegraphics-strigi-plugins kdemultimedia kdesdk kdetoys kdeutils
+KDE_VERSION_METAPKGS_DFSG :=
 
 BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?/./')
 DEV_LATEST_PACKAGE_VERSION := $(DEV_LATEST_VERSION)+$(BINARY_VERSION_NO_EPOCH)
+DEV_LATEST_PACKAGE_VERSION_DFSG := $(DEV_LATEST_VERSION)+dfsg+$(BINARY_VERSION_NO_EPOCH)
 
 override_dh_gencontrol:
 	dh_gencontrol -pkde-sc-dev-latest  -- \
@@ -19,6 +21,9 @@ override_dh_gencontrol:
 	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS)) -- \
 	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'
+	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS_DFSG)) -- \
+	    '-v$(DEV_LATEST_PACKAGE_VERSION_DFSG)' \
+	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'
 	dh_gencontrol --remaining-packages -- \
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
 	    -Vcalligra:Version='$(CALLIGRA_VERSION)' \

-- 
KDE metapackages