[SCM] plasma-volume-control packaging branch, kubuntu_wily_backports, updated. debian/5.4.3-1-35-g5ffecec

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-pa.git;a=commitdiff;h=18ef69d

The following commit has been merged in the kubuntu_wily_backports branch:
commit 18ef69da8eae6230b9f9ce7430da2034cbb24bba
Merge: 8e8d963ff09703d525f3b91bcc5c3fbc24bf1a10 5680ff70f71bbf25cc5b39e8dac56f728189fb15
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Dec 11 04:51:35 2015 -0800

    Again in unstable branch.

 debian/changelog | 34 ++++++++++++++++++++++++++++++++
 debian/control   | 21 ++++++--------------
 debian/copyright | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 debian/watch     |  2 ++
 4 files changed, 100 insertions(+), 16 deletions(-)

diff --cc debian/changelog
index f408790,db1e563..b0af862
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,3 -1,17 +1,18 @@@
+ plasma-pa (4:5.4.3-0ubuntu2) UNRELEASED; urgency=medium
+ 
+   * Debian Merge: Remaining changes:
+   * Added conflict to kmix as the two installed at the same
+     time renders plasma-pa unusable until kmix is disabled. 
++  * Again in unstable branch. 
+ 
+  -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 11 Dec 2015 04:41:51 -0800
+ 
+ plasma-pa (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:34 +0100
+ 
  plasma-pa (4:5.4.3-0ubuntu1) xenial; urgency=medium
  
    [ Scarlett Clark ]

-- 
plasma-volume-control packaging