[SCM] plasma-sdk packaging branch, kubuntu_unstable, updated. ubuntu/4%5.4.3-0ubuntu1-24-g04c9556

[Clive Johnston]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-sdk.git;a=commitdiff;h=04c9556

The following commit has been merged in the kubuntu_unstable branch:
commit 04c95569714dd690cb59e809f3333ab05bea30d5
Merge: 6b75298b57c01faf27f0843a477c7faec447c228 db17385477dbb7e2d4ba391f9edd14067c07a4a9
Author: Clive Johnston <clivejo at aol.com>
Date:   Sat Feb 6 00:10:46 2016 +0000

    Merge remote-tracking branch 'origin/kubuntu_xenial_archive' into kubuntu_unstable

 debian/changelog | 21 ++++++++++++++++++---
 debian/control   | 55 +++++++++++++++++++++++++++----------------------------
 2 files changed, 45 insertions(+), 31 deletions(-)

diff --cc debian/changelog
index b735ba9,4ec78db..ee2b8bd
--- a/debian/changelog
+++ b/debian/changelog
@@@ -4,20 -4,24 +4,32 @@@ plasma-sdk (4:5.5.4-0ubuntu1) UNRELEASE
    * New upstream release Xenial
  
    [ Clive Johnston ]
--  * new upstream release
    * New upstream release
  
 +  [ Scarlett Clark ]
 +  * Debian merge, No remaining changes. 
 +
-  -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 18:01:43 +0000
+   [ Philip Muškovac ]
+   * Merge with debian git master
+ 
+   [ Clive Johnston ]
+   * New upstream release
+ 
+  -- Clive Johnston <clivejo at aol.com>  Wed, 27 Jan 2016 20:18:11 +0000
+ 
+ plasma-sdk (5.4.3-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.3).
+   * Update install files.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:51 +0100
  
 +plasma-sdk (5.4.3-1) unstable; urgency=medium
 +
 +  * New upstream release (5.4.3).
 +
 + -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:51 +0100
 +
  plasma-sdk (4:5.4.3-0ubuntu1) xenial; urgency=medium
  
    * New upstream bugfix release (LP: #1518598)
@@@ -73,12 -77,6 +85,15 @@@ plasma-sdk (4:5.3.95-0ubuntu1) wily; ur
  
   -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 10 Aug 2015 23:20:55 +0200
  
++<<<<<<< HEAD
 +plasma-sdk (4:5.3.2-0ubuntu1) wily; urgency=medium
 +
 +  * Update install files.
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 12:37:30 +0000
 +
++=======
++>>>>>>> origin/kubuntu_xenial_archive
  plasma-sdk (5.3.2-1) unstable; urgency=medium
  
    * New upstream release (5.3.2).

-- 
plasma-sdk packaging