[SCM] KDE metapackages branch, master, updated. debian/75

[Modestas Vainius]

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

The following commit has been merged in the master branch:
commit b05b0279bde61545ef5468f729a2b314ab1e9abc
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 26 18:38:01 2012 +0300

    Rename koffice to calligra, bump its version to 2.4.1.
---
 debian/changelog |    3 +++
 debian/control   |    2 +-
 debian/rules     |    4 ++--
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7f35362..1f386ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,9 @@ meta-kde (5:75) UNRELEASED; urgency=low
   * Copy the kdeaccessibility and kdeutils metapackages from the homonymous
     sources.
 
+  [ Modestas Vainius ]
+  * Rename koffice to calligra, bump its version to 2.4.1.
+
  -- 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 5a300c6..035ad5a 100644
--- a/debian/control
+++ b/debian/control
@@ -85,7 +85,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 (>= ${koffice:Version}), xorg
+Suggests: kde-l10n (>= ${kde:Version}), calligra (>= ${calligra:Version}), xorg
 Provides: kde-software-compilation
 Breaks: kde-minimal (<< 5:57)
 Description: complete KDE Software Compilation for end users
diff --git a/debian/rules b/debian/rules
index 8257671..277aabe 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 
 MINIMUM_KDE_VERSION := 4:4.7.4
 MINIMUM_KDEPIM_VERSION := 4:4.4.11
-KOFFICE_VERSION := 1:2.3.3
+CALLIGRA_VERSION := 1:2.4.1
 DEV_LATEST_VERSION := 4:4.8.3
 DEV_PREV_VERSION := 4:4.7.4
 
@@ -21,7 +21,7 @@ override_dh_gencontrol:
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'
 	dh_gencontrol --remaining-packages -- \
 	    -Vkdepim:Version='$(MINIMUM_KDEPIM_VERSION)' \
-	    -Vkoffice:Version='$(KOFFICE_VERSION)' \
+	    -Vcalligra:Version='$(CALLIGRA_VERSION)' \
 	    -Vkde:Version='$(MINIMUM_KDE_VERSION)'
 
 %:

-- 
KDE metapackages