[SCM] KDE metapackages branch, master, updated. debian/81-2-g25c5bef

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 25c5befaddad30af8cdc7c4f60a2b90b11daa856
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 10 13:25:11 2013 +0200

    run dh_gencontrol with +dfsg only if there are metapackages needing it
---
 debian/changelog |    3 +++
 debian/rules     |    2 ++
 2 files changed, 5 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index c2b4ad4..4f5c106 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 meta-kde (5:82) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Run the custom dh_gencontrol with +dfsg in version only if there are
+    metapackages needing it.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 10 Sep 2013 13:20:51 +0200
 
diff --git a/debian/rules b/debian/rules
index 1414632..34ee21c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -21,9 +21,11 @@ override_dh_gencontrol:
 	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS)) -- \
 	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'
+ifneq (,$(KDE_VERSION_METAPKGS_DFSG))
 	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS_DFSG)) -- \
 	    '-v$(DEV_LATEST_PACKAGE_VERSION_DFSG)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'
+endif
 	dh_gencontrol --remaining-packages -- \
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
 	    -Vcalligra:Version='$(CALLIGRA_VERSION)' \

-- 
KDE metapackages