[SCM] KDE metapackages branch, master, updated. debian/70-9-g60b58c8

[Pino Toscano]

The following commit has been merged in the master branch:
commit 60b58c88ce5a1431a3ad65b35e9dcc4738c1aa4d
Author: Pino Toscano <pino at debian.org>
Date:   Tue Sep 27 16:50:35 2011 +0200

    set a proper version of kdeedu, kdegraphics, and kdegraphics-libs-data
    
    set them in a single place, and take care of replacing kde:Version in them
    (kdegraphics-libs-data had already the proper version, this makes it part of a more general way)
---
 debian/changelog |    2 ++
 debian/rules     |    7 +++++--
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00f34f8..704ddba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ meta-kde (5:71~pre3) UNRELEASED; urgency=low
   * Switch to my @debian.org address, I'm a DD now.
   * Add the metapackages for kdeedu and kdegraphics, as these modules are no
     more monolithic sources.
+  * Set a proper version of kdeedu, kdegraphics, and kdegraphics-libs-data
+    (following the KDE release version).
 
   [ José Manuel Santamaría Lema ]
   * Bump dev:latestVersion to 4.7.1.
diff --git a/debian/rules b/debian/rules
index 0a26497..67f5f59 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,8 @@ KOFFICE_VERSION := 1:2.3.3
 DEV_LATEST_VERSION := 4:4.7.1
 DEV_PREV_VERSION := 4:4.7.1
 
+KDE_VERSION_METAPKGS := kdeedu kdegraphics kdegraphics-libs-data
+
 BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?/./')
 DEV_LATEST_PACKAGE_VERSION := $(DEV_LATEST_VERSION)+$(BINARY_VERSION_NO_EPOCH)
 
@@ -15,8 +17,9 @@ override_dh_gencontrol:
 	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \
 	    -V'devLatest:Version=$(DEV_LATEST_VERSION)' \
 	    -V'devPrev:Version=$(DEV_PREV_VERSION)'
-	dh_gencontrol -pkdegraphics-libs-data  -- \
-	    '-v$(DEV_LATEST_PACKAGE_VERSION)' 
+	dh_gencontrol $(addprefix -p,$(KDE_VERSION_METAPKGS)) -- \
+	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \
+	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'
 	dh_gencontrol --remaining-packages -- \
 	    -VkonqPlugins:Version='$(KONQ_PLUGINS_VERSION)' \
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \

-- 
KDE metapackages