[SCM] kaccounts-integration packaging branch, kubuntu_unstable, updated. ubuntu/4%15.08.2-0ubuntu1-63-g5f13de2

[Scarlett Clark]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/kaccounts-integration.git;a=commitdiff;h=5f13de2

The following commit has been merged in the kubuntu_unstable branch:
commit 5f13de29423a36996bd332c3d09c943d41a193e0
Merge: 08b88bd5bbdf905ab02527722f85bafc8d4a43b9 07b290b738174fe3293d9494b00e73aa31020404
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Jan 28 13:52:09 2016 -0800

    Fix CI merge after debian merge.

 debian/changelog                            | 55 +++++++++++++++++++
 debian/control                              | 85 +++++++++++++++--------------
 debian/copyright                            | 10 +++-
 debian/libkaccounts-dev.acc.in              | 20 +++++++
 debian/libkaccounts1.symbols                |  9 ++-
 debian/qml-module-org-kde-kaccounts.install |  5 ++
 debian/rules                                |  6 +-
 debian/tests/acc                            | 11 ++++
 debian/tests/control                        |  8 ++-
 debian/tests/testsuite.xsession             | 12 ++--
 10 files changed, 167 insertions(+), 54 deletions(-)

diff --cc debian/changelog
index fadaac1,ac8741b..a8c4aaf
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,32 +1,37 @@@
+ kaccounts-integration (4:15.12.1-0ubuntu1) UNRELEASED; urgency=medium
+ 
+   * New upstream release.
+   * Debian merge: No remaining changes.
+   * Actually bump the version...
++  * Fix CI merge after debian merge. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 28 Jan 2016 13:44:50 -0800
+ 
  kaccounts-integration (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
  
 +  [ Clive Johnston ]
    * New upstream release
  
 +  [ Bhushan Shah ]
 +  * Add dep to intltool for libkaccounts-dev
 +
   -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:32:35 +0000
  
+ kaccounts-integration (15.12.0-1~) UNRELEASED; urgency=medium
+ 
+   * New upstream release.
+   * Add libkf5declarative-dev to Build-Depends.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 16 Dec 2015 16:16:41 +0100
+ 
+ kaccounts-integration (15.08.3-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Change my email address back
+   * Update symbols file with new symbols.
+ 
+  -- Diane Trout <diane at ghic.org>  Fri, 04 Dec 2015 10:55:04 -0800
+ 
  kaccounts-integration (4:15.08.2-0ubuntu1) wily; urgency=medium
  
    * New upstream release

-- 
kaccounts-integration packaging