[SCM] Calligra suite packaging branch, master, updated. debian/2.4.2-3-10-g5ab7925

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 5ab7925a6ffe92543f294ab1075b2211e9606657
Author: Pino Toscano <pino at debian.org>
Date:   Mon Aug 6 11:10:26 2012 +0200

    split templates from calligra-data, part #2
    
    add proper breaks/replaces entries in control, fill changelog
---
 debian/changelog |    2 ++
 debian/control   |   12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 22e4058..dbd56eb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ calligra (1:2.4.3-2) UNRELEASED; urgency=low
   [ Adrien Grellier ]
   * Fix karbon: extra space for paragraph separation in the package
     description. (Closes: #679731)
+  * Split the templates from calligra-data to the application's packages.
+    (Closes: #682763)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 Jul 2012 19:05:06 +0200
 
diff --git a/debian/control b/debian/control
index f623988..330bb96 100644
--- a/debian/control
+++ b/debian/control
@@ -82,6 +82,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)
 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
@@ -337,8 +339,8 @@ Description: thesaurus for the Calligra Suite
 Package: calligrasheets
 Architecture: any
 Section: math
-Replaces: kspread (<< 1:2.4)
-Breaks: kspread (<< 1:2.4)
+Replaces: kspread (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
+Breaks: kspread (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Suggests: khelpcenter4
 Homepage: http://www.calligra-suite.org/sheets/
@@ -384,6 +386,8 @@ Package: calligrawords-data
 Architecture: all
 Section: text
 Depends: ${misc:Depends}
+Breaks: calligra-data (<< 1:2.4.3-2)
+Replaces: calligra-data (<< 1:2.4.3-2)
 Homepage: http://www.calligra-suite.org/words/
 Description: data files for Words word processor
  This package contains architecture-independent data files for Words,
@@ -396,8 +400,8 @@ Description: data files for Words word processor
 Package: calligrastage
 Architecture: any
 Section: kde
-Replaces: kpresenter (<< 1:2.4)
-Breaks: kpresenter (<< 1:2.4)
+Replaces: kpresenter (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
+Breaks: kpresenter (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Suggests: khelpcenter4
 Homepage: http://www.calligra-suite.org/stage/

-- 
Calligra suite packaging