[SCM] plasma-nm packaging branch, kubuntu_stable, updated. ubuntu/4%5.4.3-0ubuntu1-30-ge588c5e

[Clive Johnston]

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

The following commit has been merged in the kubuntu_stable branch:
commit bc54e93c76f8021726fdb6127a00f85e8b48cb75
Merge: 06890cf79a266f563b608861d7b29af464032f2c 7e484500a20384f2f59d64cdf0541d3c4f500653
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Jan 15 11:36:05 2016 +0100

    Merge branch 'kubuntu_stable' into kubuntu_unstable
    
    # Conflicts:
    #	debian/changelog

 debian/changelog | 4 ++++
 debian/control   | 1 +
 2 files changed, 5 insertions(+)

diff --cc debian/changelog
index ff971a6,9aabe52..a2a05d1
--- a/debian/changelog
+++ b/debian/changelog
@@@ -8,17 -8,12 +8,21 @@@ plasma-nm (4:5.5.3-0ubuntu1) UNRELEASED
    * new upstream release
    * New upstream release
  
+   [ Harald Sitter ]
+   * Make plasma-nm recommend libkf5wallet-bin as wifi password storage is not
+     working unless kwallet is installed (and enabled).
+ 
 +  [ Scarlett Clark ]
 +  * Debian merge, No remaining changes. 
 +
   -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 18:01:13 +0000
  
 +plasma-nm (4: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:54 +0100
 +
  plasma-nm (4:5.4.3-0ubuntu1) xenial; urgency=medium
  
    [ Scarlett Clark ]

-- 
plasma-nm packaging