[SCM] KOffice packaging branch, master, updated. debian/2.2.1-1-14-g7895406

[Raúl Sánchez Siles]

The following commit has been merged in the master branch:
commit 7895406f33cee9587f9a36ad9abe667df658a8e6
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Sat Aug 7 20:27:49 2010 +0200

    * (needs testing) Fix "koffice-doc-html should conflict with old kpresenter data" Adding Breaks and Replaces old kpresenter-data package. (Closes: #590172)
---
 debian/changelog |    7 ++++++-
 debian/control   |    2 ++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 51d904c..c60c517 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
 koffice (1:2.2.1-3) UNRELEASED; urgency=low
 
+  [ Ana Beatriz Guerrero Lopez ]
   * Fix build in armel, backport rev 1124896 from upstream.
   * TODO: kformula description (Closes: #589066)
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Wed, 14 Jul 2010 20:55:40 +0200
+  [ Raúl Sánchez Siles ]
+  * Fix "koffice-doc-html should conflict with old kpresenter data"
+    Adding Breaks and Replaces old kpresenter-data package. (Closes: #590172)
+
+ -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Sat, 07 Aug 2010 20:29:02 +0200
 
 koffice (1:2.2.1-2) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 6d371ff..48d1dfd 100644
--- a/debian/control
+++ b/debian/control
@@ -37,6 +37,8 @@ Package: koffice-doc-html
 Architecture: all
 Section: doc
 Suggests: konqueror | www-browser, koffice
+Breaks: kpresenter-data (<< 1:2.0.0)
+Replaces: kpresenter-data (<< 1:2.0.0)
 Description: KDE Office Suite documentation in HTML format
  KOffice is an integrated office suite for KDE, the K Desktop
  Environment.  It offers a word processor, spreadsheet, presentation

-- 
KOffice packaging