[SCM] Calligra suite packaging branch, wheezy, updated. debian/2.4.3-4-4-g0839ae9

[Adrien Grellier]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=0839ae9

The following commit has been merged in the wheezy branch:
commit 0839ae91d51c912707a7e57e45a583d55e8df9fd
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date:   Thu Jan 31 09:51:27 2013 +0100

    calligrastage: break/replace koffice-data < 2.4 (#699200)
---
 debian/changelog |    1 +
 debian/control   |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2ce66a6..fb8026b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ calligra (1:2.4.3-5) UNRELEASED; urgency=low
 
   [ Adrien Grellier ]
   * Fix typo in calligrasheets package description (Closes: #697261) 
+  * Make calligrastage break/replace koffice-data < 1:2.4 (Closes: #699200)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 16 Dec 2012 00:51:22 -0300
 
diff --git a/debian/control b/debian/control
index bece5e3..774f16e 100644
--- a/debian/control
+++ b/debian/control
@@ -403,8 +403,8 @@ Description: data files for Words word processor
 Package: calligrastage
 Architecture: any
 Section: kde
-Replaces: kpresenter (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
-Breaks: kpresenter (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
+Replaces: kpresenter (<< 1:2.4), calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
+Breaks: kpresenter (<< 1:2.4), calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Suggests: khelpcenter4
 Homepage: http://www.calligra-suite.org/stage/

-- 
Calligra suite packaging