[SCM] ktp-common-internals packaging branch, master, updated. debian/0.8.1-1-28-g02994ef

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-common-internals.git;a=commitdiff;h=4bf712c

The following commit has been merged in the master branch:
commit 4bf712cbba2a4e79d4d0635798d6e3e289e2460e
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Nov 5 12:28:48 2014 +0100

    kde-telepathy-kpeople breaks/replaces old kde-telepathy-data
    
    Conflicts:
    	debian/changelog
---
 debian/changelog | 1 +
 debian/control   | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1ea09fa..bd08f69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ ktp-common-internals (0.9.0-1) UNRELEASED; urgency=medium
   * New upstream release
   * Merge with Debian, no changes
   * Make -dev package depend on libktpotrprivate8
+  * kde-telepathy-kpeople breaks/replaces old kde-telepathy-data
 
   [ Diane Trout ]
   Pull changes from kubuntu.
diff --git a/debian/control b/debian/control
index 4b47b9c..605442a 100644
--- a/debian/control
+++ b/debian/control
@@ -119,6 +119,8 @@ Description: KDE Telepathy internal library - debug symbols
 Package: kde-telepathy-kpeople
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Breaks: kde-telepathy-data (<< 0.9.0)
+Replaces: kde-telepathy-data (<< 0.9.0)
 Description: kpeople plugins for kde-telepathy
  This allows grouping multiple IM accounts into meta-contacts.
  .

-- 
ktp-common-internals packaging