[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=93090a4

The following commit has been merged in the master branch:
commit 93090a4301aa0f13b5211a32c5823cd3fad26f16
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Nov 3 16:12:00 2014 +0100

    Make -dev package depend on libktpotrprivate8
    
    Conflicts:
    	debian/changelog
    
    Make a plausible changlelog merging in Jonathan's
    change.
---
 debian/changelog | 12 ++++++++++++
 debian/control   |  1 +
 2 files changed, 13 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 89e0e7f..1ea09fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+ktp-common-internals (0.9.0-1) UNRELEASED; urgency=medium
+
+  [ Jonathan Riddell ]
+  * New upstream release
+  * Merge with Debian, no changes
+  * Make -dev package depend on libktpotrprivate8
+
+  [ Diane Trout ]
+  Pull changes from kubuntu.
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Oct 2014 13:14:01 +0100
+
 ktp-common-internals (0.8.80-1) UNRELEASED; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index e6e50e1..4b47b9c 100644
--- a/debian/control
+++ b/debian/control
@@ -24,6 +24,7 @@ Architecture: any
 Depends: libktpcommoninternalsprivate8 (= ${binary:Version}),
  libktpwidgetsprivate8 (= ${binary:Version}),
  libktploggerprivate8 (= ${binary:Version}),
+ libktpotrprivate8 (= ${binary:Version}),
  ${misc:Depends}
 Description: KDE Telepathy internal library - Development headers
  Internal library which consists of the most reused

-- 
ktp-common-internals packaging