[SCM] KDE metapackages branch, master, updated. debian/74-5-gedf5434

[Pino Toscano]

The following commit has been merged in the master branch:
commit 22beafa93f57c317132d538476baadee72aab049
Author: Pino Toscano <pino at debian.org>
Date:   Thu Mar 8 18:46:04 2012 +0100

    drop konqPlugins:Version and make konq-plugins use kde:Version
    
    konq-plugins is part of kde-baseapps
---
 debian/changelog |    4 ++++
 debian/control   |    2 +-
 debian/rules     |    2 --
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4cf3c99..514ebd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ meta-kde (5:75) UNRELEASED; urgency=low
     - kdegraphics-strigi-plugins
   * Bump minimum KDE SC version to 4.7.4.
 
+  [ Pino Toscano ]
+  * Drop konqPlugins:Version and make konq-plugins use kde:Version, since
+    it is part of kde-baseapps.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 07 Mar 2012 03:22:03 +0100
 
 meta-kde (5:74) unstable; urgency=low
diff --git a/debian/control b/debian/control
index f6798b0..37a0215 100644
--- a/debian/control
+++ b/debian/control
@@ -62,7 +62,7 @@ Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}) | kde-plasma
  kmix (>= ${kde:Version}), ksnapshot (>= ${kde:Version}), kscreensaver (>= ${kde:Version}),
  okular (>= ${kde:Version}), plasma-desktopthemes-artwork (>= ${kde:Version}), sweeper (>= ${kde:Version}),
  khelpcenter4 (>= ${kde:Version})
-Recommends: konq-plugins (>= ${konqPlugins:Version}), plasma-widget-networkmanagement, freespacenotifier,
+Recommends: konq-plugins (>= ${kde:Version}), plasma-widget-networkmanagement, freespacenotifier,
  update-notifier-kde
 Suggests: kde-l10n (>= ${kde:Version}), kde-plasma-desktop (>= ${source:Version}),
  kde-plasma-netbook (>= ${source:Version}), skanlite
diff --git a/debian/rules b/debian/rules
index e6884fb..0fa1aa9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 MINIMUM_KDE_VERSION := 4:4.7.4
 MINIMUM_KDEPIM_VERSION := 4:4.4.11
-KONQ_PLUGINS_VERSION := $(MINIMUM_KDE_VERSION)
 KOFFICE_VERSION := 1:2.3.3
 DEV_LATEST_VERSION := 4:4.7.4
 DEV_PREV_VERSION := 4:4.7.4
@@ -21,7 +20,6 @@ override_dh_gencontrol:
 	    '-v$(DEV_LATEST_PACKAGE_VERSION)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'
 	dh_gencontrol --remaining-packages -- \
-	    -VkonqPlugins:Version='$(KONQ_PLUGINS_VERSION)' \
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
 	    -Vkoffice:Version='$(KOFFICE_VERSION)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'

-- 
KDE metapackages