[SCM] KDE Base Applications module packaging branch, master, updated. debian/4.8.4-1-2-g2d8ee13

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kde-baseapps.git;a=commitdiff;h=2d8ee13

The following commit has been merged in the master branch:
commit 2d8ee1349d368bba482fdfc50a68b31f77310a75
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jul 1 19:15:54 2012 +0200

    konqueror: break/replace kdebase-data << 4.7.2 (#679789)
---
 debian/changelog |    3 +++
 debian/control   |    4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3eb6b96..1e5f8fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 kde-baseapps (4:4.8.4-2) UNRELEASED; urgency=low
 
+  [ Pino Toscano ]
+  * Add breaks/replaces in konqueror against kdebase-data << 4.7.2.
+    (Closes: #679789)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 01 Jul 2012 19:07:34 +0200
 
diff --git a/debian/control b/debian/control
index b133ac2..5ce82c6 100644
--- a/debian/control
+++ b/debian/control
@@ -133,8 +133,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, kde-baseapps-data (= ${source:Versi
  kde-baseapps-bin (= ${binary:Version}), install-info
 Suggests: konq-plugins (>= 4:4.1~)
 Recommends: konqueror-nsplugins (= ${binary:Version}), dolphin, kfind
-Breaks: kde-baseapps-data (<< 4:4.8.4)
-Replaces: kde-baseapps-data (<< 4:4.8.4)
+Breaks: kdebase-data (<< 4:4.7.2), kde-baseapps-data (<< 4:4.8.4)
+Replaces: kdebase-data (<< 4:4.7.2), kde-baseapps-data (<< 4:4.8.4)
 Description: advanced file manager, web browser and document viewer
  Konqueror is the KDE web browser and advanced file manager.
  .

-- 
KDE Base Applications module packaging