[SCM] Calligra suite packaging branch, wheezy, updated. debian/2.4.3-2-2-gac45460

[Pino Toscano]

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

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

    calligrawords-data: conflict/replace koffice-data (#694397)
---
 debian/changelog |    3 +++
 debian/control   |    3 ++-
 2 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4186a9a..254e92c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 calligra (1:2.4.3-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Make calligrawords-data conflict/replace old koffice-data.
+    (Closes: #694397)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 26 Nov 2012 16:35:24 +0100
 
diff --git a/debian/control b/debian/control
index 0cd33d5..f134d51 100644
--- a/debian/control
+++ b/debian/control
@@ -386,8 +386,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