[SCM] KOffice packaging branch, koffice2.3, updated. debian/2.2.1-3-54-g2654cb2

[Raúl Sánchez Siles]

The following commit has been merged in the koffice2.3 branch:
commit 7a6e3c75075bbfd840d9ea2ac162be7e9cf6c307
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Wed Nov 17 22:50:40 2010 +0100

    Make koffice-data and koffice-libs breaks and replaces old kchart versions.
---
 debian/changelog |    3 ++-
 debian/control   |    4 ++++
 2 files changed, 6 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a905c99..009e229 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,8 +11,9 @@ koffice (1:2.2.83-1) UNRELEASED; urgency=low
   * Prevent building Google docs support.
   * Added patch 16_kformula_kdeinit4 to make kformula kdeinit library 
     name compliant.
+  * Make koffice-data and koffice-libs breaks and replaces old kchart versions.
 
- -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Tue, 16 Nov 2010 20:11:28 +0100
+ -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Wed, 17 Nov 2010 22:49:42 +0100
 
 koffice (1:2.2.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 7d97d6c..dfd5a8f 100644
--- a/debian/control
+++ b/debian/control
@@ -340,6 +340,8 @@ Architecture: any
 Depends: ${shlibs:Depends}, koffice-data (>= ${source:Version})
 Recommends: ttf-lyx, ruby, python
 Suggests: wordnet, texlive
+Breaks: kchart (<=1:2.2.2-1)
+Replaces: kchart (<=1:2.2.2-1)
 Description: common libraries and binaries for the KDE Office Suite
  This package provides the libraries and binaries that are shared amongst
  the various components of KOffice.
@@ -351,6 +353,8 @@ Section: libs
 Architecture: all
 Suggests: khelpcenter4, koffice-doc-html
 Conflicts: krita-data (<< 1.9.96.0~that.is.really.1.9.95.10-2), karbon (<< 1.9.96.0~that.is.really.1.9.95.10-2), kformula (<< 1.9.96.0~that.is.really.1.9.95.10-2)
+Breaks: kchart (<=1:2.2.2-1)
+Replaces: kchart (<=1:2.2.2-1)
 Description: common shared data for the KDE Office Suite
  This package provides the architecture-independent data that is shared
  amongst the various components of KOffice.

-- 
KOffice packaging