[SCM] Calligra suite packaging branch, master, updated. debian/2.6.1-1-30-g85eea7c

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 85eea7ca6907b427bceb5cd49c1245dc12b7869d
Author: Pino Toscano <pino at debian.org>
Date:   Wed May 29 15:36:14 2013 +0200

    fix more relationships
---
 debian/changelog |    5 +++++
 debian/control   |    7 ++++---
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index dbc96e2..939cb9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,11 @@ calligra (1:2.6.3-2) unstable; urgency=low
   * calligrastage-data: add a lintian override for
     desktop-command-not-in-package for calligrastage
 
+  [ Pino Toscano ]
+  * Make calligra-libs break/replace kexi < 1:2.6.1, and raise the
+    calligra-data breaks/replaces wrt kexi to the same version (related to
+    #704597).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 29 May 2013 13:28:12 +0200
 
 calligra (1:2.6.3-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 74caf35..21a864b 100644
--- a/debian/control
+++ b/debian/control
@@ -487,8 +487,9 @@ Description: ideas organizer application for the Calligra Suite
 Package: calligra-libs
 Section: libs
 Architecture: any
-Replaces: koffice-libs, kformula
+Replaces: koffice-libs, kformula, kexi (<< 1:2.6.1)
 Conflicts: koffice-libs, kformula
+Breaks: kexi (<< 1:2.6.1)
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-data (>= ${source:Version})
 Recommends: fonts-lyx, ruby, python, libqca2-plugin-ossl
 Suggests: wordnet, texlive
@@ -502,9 +503,9 @@ Package: calligra-data
 Section: libs
 Architecture: all
 Depends: ${misc:Depends}
-Replaces: koffice-data, kformula, kexi (<< 1:2.4.4-3)
+Replaces: koffice-data, kformula, kexi (<< 1:2.6.1)
 Conflicts: koffice-data, kformula
-Breaks: kexi (<< 1:2.4.4-3)
+Breaks: kexi (<< 1:2.6.1)
 Suggests: khelpcenter4
 Description: common shared data for the Calligra Suite
  This package provides the architecture-independent data that is shared

-- 
Calligra suite packaging