[SCM] KDE Base Applications module packaging branch, kubuntu_wily_archive, updated. ubuntu/15.08.0-0ubuntu2-2-gd76176f

[Harald Sitter]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit d76176fd4a18015079add2859201f9915667607c
Author: Harald Sitter <sitter at kde.org>
Date:   Tue Sep 1 10:32:58 2015 +0200

    Make dolphin4 breaks&replace kde-baseapps-data << 15.10 as it contains data files that previously lived in that package.
---
 debian/changelog | 7 +++++++
 debian/control   | 2 ++
 2 files changed, 9 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b2ebf6e..b937b39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kde-baseapps (4:15.08.0-0ubuntu4) UNRELEASED; urgency=medium
+
+  * Make dolphin4 breaks&replace kde-baseapps-data << 15.10 as it contains
+    data files that previously lived in that package.
+
+ -- Harald Sitter <sitter at kde.org>  Tue, 01 Sep 2015 10:32:11 +0200
+
 kde-baseapps (4:15.08.0-0ubuntu3) wily; urgency=medium
 
   * Add kubuntu_ignore-tests.diff to ignore tests failing due to plasma
diff --git a/debian/control b/debian/control
index 9f3694e..389571d 100644
--- a/debian/control
+++ b/debian/control
@@ -121,6 +121,8 @@ Description: file search utility
 Package: dolphin4
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Breaks: kde-baseapps-data (<< 4:15.10.0)
+Replaces: kde-baseapps-data (<< 4:15.10.0)
 Description: file browser
  Dolphin file browser, this kdelibs4 build is mainly for use with
  Konqueror.

-- 
KDE Base Applications module packaging