[SCM] ktp-accounts-kcm packaging branch, master, updated. debian/0.6.3-1-39-g58c6f2a

[Diane Trout]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/kde-telepathy/ktp-accounts-kcm.git;a=commitdiff;h=eb32a74

The following commit has been merged in the master branch:
commit eb32a74936c43ac03fa5820a76ef779fc90d0218
Author: Diane Trout <diane at ghic.org>
Date:   Tue Dec 9 17:25:28 2014 -0800

    merge unreleased 0.8.80 entries with 0.9.0 kubuntu changelog
---
 debian/changelog | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 55a939b..b7f2044 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,9 @@
-ktp-accounts-kcm (0.9.0-0ubuntu1) UNRELEASED; urgency=medium
-
-  * New upstream release
-
- -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 28 Oct 2014 13:14:00 +0100
-
-ktp-accounts-kcm (0.8.80-1) UNRELEASED; urgency=medium
+ktp-accounts-kcm (0.9.0-1) UNRELEASED; urgency=medium
 
   * New upstream release.
-  * Update libktpcommoninternalsprivate-dev build-dep to 0.8.80
+  * Update libktpcommoninternalsprivate-dev build-dep to 0.9.0
   * Change kde-telepathy-data to source:Upstream-Version
+  * Merged kubuntu changes by Jonathan Riddell
 
  -- Diane Trout <diane at ghic.org>  Sun, 21 Sep 2014 11:03:26 -0700
 

-- 
ktp-accounts-kcm packaging