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

[Pino Toscano]

The following commit has been merged in the master branch:
commit 9aaf9e1a849f899b8f64d813acae30bacdabd867
Author: Pino Toscano <pino at kde.org>
Date:   Thu Mar 3 19:59:10 2011 +0100

    set the koffice version with a variable
---
 debian/control |    2 +-
 debian/rules   |    2 ++
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/control b/debian/control
index d2e4dbb..7e192e1 100644
--- a/debian/control
+++ b/debian/control
@@ -76,7 +76,7 @@ Depends: ${misc:Depends}, kde-plasma-desktop (>= ${source:Version}),
 Recommends: kde-standard (>= ${source:Version}), 
  kdeaccessibility (>= ${kde:Version}), kdesdk (>= ${kde:Version}),
  kdetoys (>= ${kde:Version}), kdewebdev (>= ${kde:Version})
-Suggests: kde-l10n (>= ${kde:Version}), koffice ( >= 1:2.0.0), xorg
+Suggests: kde-l10n (>= ${kde:Version}), koffice ( >= ${koffice:Version}), xorg
 Provides: kde-software-compilation
 Breaks: kde-minimal (<< 5:57)
 Description: the complete KDE Software Compilation for end users
diff --git a/debian/rules b/debian/rules
index e65cc6a..93d43db 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 MINIMUM_KDE_VERSION := 4:4.4.3
 MINIMUM_KDEPIM_VERSION := 4:4.4.3
 KONQ_PLUGINS_VERSION := 4:4.3.0
+KOFFICE_VERSION := 1:2.2.1
 DEV_LATEST_VERSION := 4:4.6.1
 
 BINARY_VERSION_NO_EPOCH := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: \(\([[:digit:]]\+\):\)\?/\2./')
@@ -14,6 +15,7 @@ override_dh_gencontrol:
 	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