[SCM] Calligra suite packaging branch, wheezy, updated. debian/2.4.4-1-1-gcaf958a

Adrien Grellier adrien-guest at alioth.debian.org
Sat Feb 16 18:17:59 UTC 2013


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

The following commit has been merged in the wheezy branch:
commit caf958a3c5e9ac9bbb5d319d731943fddb7def4a
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date:   Sat Feb 16 19:17:31 2013 +0100

    make calligrasheets break/replace koffice-data (#700667)
---
 debian/changelog |    7 +++++++
 debian/control   |    4 ++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2886dae..9abb7b8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+calligra (1:2.4.4-2) UNRELEASED; urgency=low
+
+  [ Adrien Grellier ]
+  * Make calligrasheets break/replace koffice-data < 1:2.4. (Closes: #700667)
+
+ -- Adrien Grellier <adrien.grellier at laposte.net>  Sat, 16 Feb 2013 19:14:31 +0100
+
 calligra (1:2.4.4-1) unstable; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
diff --git a/debian/control b/debian/control
index 774f16e..e078193 100644
--- a/debian/control
+++ b/debian/control
@@ -341,8 +341,8 @@ Description: thesaurus for the Calligra Suite
 Package: calligrasheets
 Architecture: any
 Section: math
-Replaces: kspread (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
-Breaks: kspread (<< 1:2.4), calligra-data (<< 1:2.4.3-2)
+Replaces: kspread (<< 1:2.4), calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
+Breaks: kspread (<< 1:2.4), calligra-data (<< 1:2.4.3-2), koffice-data (<< 1:2.4)
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Suggests: khelpcenter4
 Homepage: http://www.calligra-suite.org/sheets/

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list