[SCM] Calligra suite packaging branch, master, updated. debian/2.4.3-2-371-g0c2e8c9

[Adrien Grellier]

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

The following commit has been merged in the master branch:
commit 0c2e8c9b0337ceb0bc25ce78a74ace2947ff4cc1
Author: Adrien Grellier <adrien.grellier at laposte.net>
Date:   Sat Apr 6 19:07:47 2013 +0200

    Make calligra-data Break/Replace kexi < 1:2.4
---
 debian/changelog |    6 +++++-
 debian/control   |    3 ++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d788856..d7f8bcb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 calligra (1:2.6.2-1) UNRELEASED; urgency=low
 
+  [ Raúl Sánchez Siles ]
   * New upstream release.
 
- -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Fri, 22 Mar 2013 21:29:31 +0100
+  [ Adrien Grellier ]
+  * Make calligra-data Break/Replace kexi < 1:2.4 (Closes: #704597)
+
+ -- Adrien Grellier <adrien.grellier at laposte.net>  Sat, 06 Apr 2013 19:05:49 +0200
 
 calligra (1:2.6.1-1) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index 6e8d0f8..575820a 100644
--- a/debian/control
+++ b/debian/control
@@ -496,8 +496,9 @@ Package: calligra-data
 Section: libs
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: koffice-data, kformula
+Replaces: koffice-data, kformula, kexi (<< 1:2.4.4-3)
 Conflicts: koffice-data, kformula
+Breaks: kexi (<< 1:2.4.4-3)
 Suggests: khelpcenter4
 Description: common shared data for the Calligra Suite
  This package provides the architecture-independent data that is shared

-- 
Calligra suite packaging