[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.3-2-368-g6843e2f

[Adrien Grellier]

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

The following commit has been merged in the tip branch:
commit 05d213a8f85d129477a64e898ae3aa99e33ad0ef
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date:   Fri Feb 22 12:39:31 2013 +0100

    make calligrasheets break/replace koffice-data
---
 debian/changelog |    1 +
 debian/control   |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d29a7a4..4855890 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,7 @@ calligra (1:2.6.0-1) UNRELEASED; urgency=low
   [ Adrien Grellier ]
   * Fix typo in calligrasheets package description (Closes: #697261) 
   * Make calligrastage break/replace koffice-data < 1:2.4 (Closes: #699200)
+  * Make calligrasheets break/replace koffice-data < 1:2.4 (Closes: #699200)
 
   [ Raúl Sánchez Siles ]
   * New upstream release
diff --git a/debian/control b/debian/control
index 4c3dd0a..6e8d0f8 100644
--- a/debian/control
+++ b/debian/control
@@ -340,8 +340,8 @@ Description: data files for Krita painting program
 Package: calligrasheets
 Architecture: any
 Section: math
-Replaces: kspread (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
-Breaks: kspread (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
+Replaces: kspread (<< 1:2.4), calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
+Breaks: kspread (<< 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/sheets/

-- 
Calligra suite packaging