[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=738e2e7

The following commit has been merged in the tip branch:
commit 738e2e7f2048468be9a754ef41225ab17716ac26
Author: Pino Toscano <pino at debian.org>
Date:   Mon Nov 26 16:42:06 2012 +0100

    calligrawords-data: conflict/replace koffice-data (#694397)
    
    --HG--
    extra : transplant_source : MV%0F%93a%02%E2U%EAoo%1E%8D-%C9%89%1C%B1%15%C4
---
 debian/changelog |    3 +++
 debian/control   |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 39b9592..7ffa376 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,7 @@
 calligra (1:2.5.92-1) UNRELEASED; urgency=low
+  [ Pino Toscano ]
+  * Make calligrawords-data conflict/replace old koffice-data.
+    (Closes: #694397)
 
   [ Raúl Sánchez Siles ]
   * New upstream release
diff --git a/debian/control b/debian/control
index 4ba10d6..ea75a42 100644
--- a/debian/control
+++ b/debian/control
@@ -384,8 +384,9 @@ Package: calligrawords-data
 Architecture: all
 Section: text
 Depends: ${misc:Depends}
+Conflicts: koffice-data
 Breaks: calligra-data (<< 1:2.4.3-2)
-Replaces: calligra-data (<< 1:2.4.3-2)
+Replaces: calligra-data (<< 1:2.4.3-2), koffice-data
 Homepage: http://www.calligra-suite.org/words/
 Description: data files for Words word processor
  This package contains architecture-independent data files for Words,

-- 
Calligra suite packaging