[SCM] Calligra suite packaging branch, master, updated. debian/2.4.3-2-360-gee8ce7f

[Adrien Grellier]

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

The following commit has been merged in the master branch:
commit 007f48ee8a3c20755c4e16d0c38e7d1939464874
Author: Pino Toscano <pino at debian.org>
Date:   Sat Dec 1 12:25:49 2012 +0100

    karbon: break/replace koffice-data < 2.4 (#694855)
    
    --HG--
    extra : transplant_source : %A3Y%7C/s%B5%BF%1D%F8%40Lx%D2%2A1%1D%10%5E%264
---
 debian/changelog |    1 +
 debian/control   |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index efb0247..66868ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ calligra (1:2.5.92-1) UNRELEASED; urgency=low
     (Closes: #694397)
   [ Pino Toscano ]
   * Make krita-data break/replace krita-data < 2.4. (Closes: #694854)
+  * Make karbon break/replace koffice-data < 2.4. (Closes: #694855)
 
   [ Raúl Sánchez Siles ]
   * New upstream release
diff --git a/debian/control b/debian/control
index 0106f8e..883264a 100644
--- a/debian/control
+++ b/debian/control
@@ -80,8 +80,8 @@ Architecture: any
 Section: graphics
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Recommends: pstoedit
-Breaks: calligra-data (<< 1:2.4.3-2)
-Replaces: calligra-data (<< 1:2.4.3-2)
+Breaks: koffice-data (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
+Replaces: koffice-data (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
 Homepage: http://www.calligra-suite.org/karbon/
 Description: vector graphics application for the Calligra Suite
  Karbon is a vector drawing application with an user interface that is easy to

-- 
Calligra suite packaging