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

Scarlett Clark sgclark-guest at moszumanska.debian.org
Fri Jan 29 02:32:00 UTC 2016


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

The following commit has been merged in the kubuntu_unstable branch:
commit 4f3816d76dc3609d09620790e635209842e97c10
Merge: 5f13de29423a36996bd332c3d09c943d41a193e0 d56cd85262855dac08fa3405a4d65d8003471e8f
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Thu Jan 28 18:31:52 2016 -0800

    Fix install file.

 debian/changelog                            | 2 ++
 debian/qml-module-org-kde-kaccounts.install | 4 ----
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --cc debian/changelog
index a8c4aaf,21bf676..ac07f19
--- a/debian/changelog
+++ b/debian/changelog
@@@ -3,7 -3,7 +3,9 @@@ kaccounts-integration (4:15.12.1-0ubunt
    * New upstream release.
    * Debian merge: No remaining changes.
    * Actually bump the version...
 +  * Fix CI merge after debian merge. 
+   * Fix install file. 
++  * Fix merge again... sigh. 
  
   -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 28 Jan 2016 13:44:50 -0800
  

-- 
kaccounts-integration packaging



More information about the pkg-kde-commits mailing list