[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=5680ff7

The following commit has been merged in the kubuntu_wily_backports branch:
commit 5680ff70f71bbf25cc5b39e8dac56f728189fb15
Merge: 9cf1cf7ddc12ccc5ea2ec3404f1aa38a1321d831 0dd62a651c0e69a6c3697720adb06f1e0e1771be
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Fri Dec 11 04:47:14 2015 -0800

     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:34 +0100 * New upstream release (5.4.2).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:51:44 +0200 * New upstream release (5.4.1).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:44:51 +0200 * Initial Debian release. * Update copyright file.
    -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 18:46:56 +0200
    
     * New upstream release (5.4.3).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 01 Dec 2015 11:45:34 +0100
     * New upstream release (5.4.2).
    -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:51:44 +0200
     * New upstream release (5.4.1).
    -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:44:51 +0200
     * Initial Debian release.
     * Update copyright file.
    -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 18:46:56 +0200

 debian/changelog | 33 +++++++++++++++++++++++++++++++
 debian/control   | 20 ++++++-------------
 debian/copyright | 59 +++++++++++++++++++++++++++++++++++++++++++++++++++++++-
 debian/watch     |  2 ++
 4 files changed, 99 insertions(+), 15 deletions(-)

diff --cc debian/changelog
index f408790,6687057..db1e563
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,43 -1,28 +1,76 @@@
++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. 
++
++ -- 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 ]
 +  * New upstream bugfix release
 +
 +  [ Philip Muškovac ]
 +  * New upstream bugfix release (LP: #1518598)
 +
 + -- Philip Muškovac <yofel at kubuntu.org>  Sun, 22 Nov 2015 16:44:11 +0100
 +
 +plasma-pa (4:5.4.2-0ubuntu3) wily; urgency=medium
 +
 +  * Add build-dep on kdelibs-bin for kde4-config
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 20 Oct 2015 16:21:57 +0100
 +
 +plasma-pa (4:5.4.2-0ubuntu2) wily; urgency=medium
 +
 +  * Add kubuntu_install-kconf-update.diff
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 19 Oct 2015 23:01:33 +0100
 +
 +plasma-pa (4:5.4.2-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Vivid backport
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 05 Oct 2015 12:12:14 -0700
 +
+ plasma-pa (5.4.2-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.2).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Tue, 06 Oct 2015 07:51:44 +0200
+ 
 +plasma-pa (4:5.4.2-0ubuntu1) wily; urgency=medium
 +
 +  * New upstream release
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Fri, 02 Oct 2015 16:01:11 +0100
 +
+ plasma-pa (5.4.1-1) unstable; urgency=medium
+ 
+   * New upstream release (5.4.1).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 11 Sep 2015 18:44:51 +0200
+ 
 +plasma-pa (4:5.4.1-0ubuntu1) wily; urgency=medium
 +
 +  * new upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Tue, 08 Sep 2015 10:24:06 +0100
 +
+ plasma-pa (5.4.0-1) unstable; urgency=medium
+ 
+   * Initial Debian release.
+   * Update copyright file.
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Thu, 03 Sep 2015 18:46:56 +0200
+ 
  plasma-pa (4:5.4.0-0ubuntu1) wily; urgency=medium
  
    * new upstream release
diff --cc debian/control
index 9c3a369,a2d3d1e..4a25145
--- a/debian/control
+++ b/debian/control
@@@ -23,7 -24,7 +24,8 @@@ Vcs-Git: git://anonscm.debian.org/pkg-k
  
  Package: plasma-pa
  Architecture: any
 -Depends: ${misc:Depends}, ${shlibs:Depends}
 +Depends: pulseaudio, ${misc:Depends}, ${shlibs:Depends}
++Conflict: kmix
  Description: Plasma 5 Volume controller
   Volume controller for Plasma 5
  

-- 
plasma-volume-control packaging