[SCM] kactivities packaging branch, kubuntu_unstable, updated. ubuntu/5.18.0-0ubuntu1-11-g1f95649

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kactivities.git;a=commitdiff;h=1f95649

The following commit has been merged in the kubuntu_unstable branch:
commit 1f95649f19052d1b0b7f7f0642a1feca0fcd350b
Merge: e182f4804885c43812c9c9158510307d2d382c41 8726c14fe3df7e09b2b5a907b66ae6acf8e33267
Author: Clive Johnston <clivejo at aol.com>
Date:   Thu Feb 25 22:43:33 2016 +0000

    Merged with Debian and New upstream release

 debian/changelog                     | 14 ++++++++++++++
 debian/control                       | 14 +-------------
 debian/kactivities.install           |  1 +
 debian/kactivities.lintian-overrides |  4 +---
 debian/rules                         |  2 +-
 5 files changed, 18 insertions(+), 17 deletions(-)

diff --cc debian/changelog
index 036f178,6fbaa5d..7702845
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,16 +1,30 @@@
 -kactivities-kf5 (5.19.0-1~) UNRELEASED; urgency=medium
++kactivities-kf5 (5.19.0-1ubuntu1) UNRELEASED; urgency=medium
+ 
 -  * New upstream release (5.19.0).
++  * Merged with Debian
++  * New upstream release
+ 
 - -- Maximiliano Curia <maxy at debian.org>  Sat, 06 Feb 2016 19:09:33 +0100
++ -- Clive Johnston <clivejo at aol.com>  Thu, 25 Feb 2016 22:40:03 +0000
+ 
+ kactivities-kf5 (5.18.0-1) experimental; urgency=medium
+ 
+   * New upstream release (5.17.0).
+   * New upstream release (5.18.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Jan 2016 13:34:42 +0100
+ 
 +kactivities-kf5 (5.18.0-0ubuntu1) xenial; urgency=medium
 +
 +  [ Scarlett Clark ]
 +  * Debian merge: No remaining changes. 
 +  * New upstream release Xenial
 +
 +  [ Philip Muškovac ]
 +  * New upstream release
 +  * Override the libkactivitymanager_plugin lintian warnings, the lib is only
 +    used internally
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Wed, 06 Jan 2016 14:55:02 +0100
 +
  kactivities-kf5 (5.16.0-1) unstable; urgency=medium
  
    * New upstream release (5.16.0).

-- 
kactivities packaging