[SCM] KDE metapackages branch, master, updated. debian/66-12-gcbb6cf7

[Pino Toscano]

The following commit has been merged in the master branch:
commit 7e8015c2226278445605d5e2ca92820d9a35cb30
Author: Pino Toscano <pino at kde.org>
Date:   Thu Mar 3 19:55:14 2011 +0100

    separate the dependencies for kdepim applications
    
    as there won't be a kdepim 4.6.0 soon, this can make the metapackages installable when the rest is updated to kde 4.6.x
---
 debian/control |    8 ++++----
 debian/rules   |    2 ++
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/control b/debian/control
index 6b49926..d2e4dbb 100644
--- a/debian/control
+++ b/debian/control
@@ -48,9 +48,9 @@ Architecture: all
 Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}) | kde-plasma-netbook (>= ${source:Version}),
  polkit-kde-1, ark (>= ${kde:Version}), dragonplayer (>= ${kde:Version}), gwenview (>= ${kde:Version}),
  juk (>= ${kde:Version}), kate (>= ${kde:Version}), kcalc (>= ${kde:Version}),
- kmail (>= ${kde:Version}), akregator (>= ${kde:Version}), kaddressbook (>= ${kde:Version}),
- kdeplasma-addons (>= ${kde:Version}), knotes (>= ${kde:Version}),
- kwalletmanager (>= ${kde:Version}), korganizer (>= ${kde:Version}), kopete (>= ${kde:Version}),
+ kmail (>= ${kdepim:Version}), akregator (>= ${kdepim:Version}), kaddressbook (>= ${kdepim:Version}),
+ kdeplasma-addons (>= ${kde:Version}), knotes (>= ${kdepim:Version}),
+ kwalletmanager (>= ${kde:Version}), korganizer (>= ${kdepim:Version}), kopete (>= ${kde:Version}),
  kmix (>= ${kde:Version}), ksnapshot (>= ${kde:Version}), kscreensaver (>= ${kde:Version}),
  okular (>= ${kde:Version}), plasma-desktopthemes-artwork (>= ${kde:Version}), sweeper (>= ${kde:Version}),
  khelpcenter4 (>= ${kde:Version})
@@ -72,7 +72,7 @@ Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}),
  kde-plasma-netbook (>= ${source:Version}), kdeadmin (>= ${kde:Version}),
  kdeartwork (>= ${kde:Version}), kdegraphics (>= ${kde:Version}), kdeedu (>= ${kde:Version}),
  kdegames (>= ${kde:Version}), kdemultimedia (>= ${kde:Version}), kdenetwork (>= ${kde:Version}),
- kdeutils (>= ${kde:Version}), kdepim (>= ${kde:Version}), kdeplasma-addons (>= ${kde:Version})
+ kdeutils (>= ${kde:Version}), kdepim (>= ${kdepim:Version}), kdeplasma-addons (>= ${kde:Version})
 Recommends: kde-standard (>= ${source:Version}), 
  kdeaccessibility (>= ${kde:Version}), kdesdk (>= ${kde:Version}),
  kdetoys (>= ${kde:Version}), kdewebdev (>= ${kde:Version})
diff --git a/debian/rules b/debian/rules
index 080f72c..e65cc6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,7 @@
 #!/usr/bin/make -f
 
 MINIMUM_KDE_VERSION := 4:4.4.3
+MINIMUM_KDEPIM_VERSION := 4:4.4.3
 KONQ_PLUGINS_VERSION := 4:4.3.0
 DEV_LATEST_VERSION := 4:4.6.1
 
@@ -12,6 +13,7 @@ override_dh_gencontrol:
 	    '-v$(DEV_LATEST_PACKAGE_VERSION)' -V'devLatest:Version=$(DEV_LATEST_VERSION)'
 	dh_gencontrol --remaining-packages -- \
 	    -VkonqPlugins:Version='$(KONQ_PLUGINS_VERSION)' \
+	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'
 
 %:

-- 
KDE metapackages