[SCM] Calligra suite packaging branch, tip, updated. debian/2.4.2-3-6-g4bcced3

[Adrien Grellier]

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

The following commit has been merged in the tip branch:
commit 40ba9e9d3b7c6a93518c14ccb4e6efc9562cc2f2
Author: Pino Toscano <pino at debian.org>
Date:   Wed Jun 13 11:25:03 2012 +0200

    fix conflict/replaces with old koffice names (#677085)
---
 debian/changelog |    2 ++
 debian/control   |   20 ++++++++------------
 2 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f23d4ac..4bb2cbb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 calligra (1:2.4.2-3) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Fix conflict/replaces with old koffice names. (Closes: #677085)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 13 Jun 2012 10:58:57 +0200
 
diff --git a/debian/control b/debian/control
index d8118a7..00def65 100644
--- a/debian/control
+++ b/debian/control
@@ -57,8 +57,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git
 Package: calligra
 Architecture: all
 Section: kde
-Replaces: koffice
-Conflicts: koffice
 Depends: ${misc:Depends},
  braindump (>= ${source:Version}),
  calligraflow (>= ${source:Version}),
@@ -339,8 +337,8 @@ Description: thesaurus for the Calligra Suite
 Package: calligrasheets
 Architecture: any
 Section: math
-Replaces: kspread
-Conflicts: kspread
+Replaces: kspread (<< 1:2.4)
+Breaks: kspread (<< 1:2.4)
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Suggests: khelpcenter4
 Homepage: http://www.calligra-suite.org/sheets/
@@ -354,8 +352,8 @@ Description: spreadsheet for the Calligra Suite
 Package: calligraplan
 Architecture: any
 Section: kde
-Replaces: kplato
-Conflicts: kplato
+Replaces: kplato (<< 1:2.4)
+Breaks: kplato (<< 1:2.4)
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Suggests: khelpcenter4
 Homepage: http://www.calligra-suite.org/plan/
@@ -368,8 +366,8 @@ Description: integrated project management and planning tool
 Package: calligrawords
 Architecture: any
 Section: text
-Replaces: kword
-Conflicts: kword
+Replaces: kword (<< 1:2.4)
+Breaks: kword (<< 1:2.4)
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version}),
  calligrawords-data (>= ${source:Version})
 Suggests: khelpcenter4
@@ -398,8 +396,8 @@ Description: data files for Words word processor
 Package: calligrastage
 Architecture: any
 Section: kde
-Replaces: kpresenter
-Conflicts: kpresenter
+Replaces: kpresenter (<< 1:2.4)
+Breaks: kpresenter (<< 1:2.4)
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Suggests: khelpcenter4
 Homepage: http://www.calligra-suite.org/stage/
@@ -537,8 +535,6 @@ Package: calligra-dbg
 Section: debug
 Architecture: any
 Priority: extra
-Replaces: koffice-dbg
-Conflicts: koffice-dbg
 Depends: ${misc:Depends}, calligra-libs (= ${binary:Version}), kde-runtime-dbg
 Description: debugging symbols for Calligra
  This package contains the debugging symbols associated with Calligra.

-- 
Calligra suite packaging