[SCM] plasma-nm packaging branch, kubuntu_wily_backports, updated. ubuntu/4%5.4.3-0ubuntu1-8-g7da9f12

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_wily_backports branch:
commit 6cb1910ef64d7d2adc2216b30ea0562e27f45779
Merge: 9baffbdbc15c53f717653154643c1a57dde54428 533b501b902f0afcb5e51199fa720b8598ad0d35
Author: Scarlett Clark <scarlett at scarlettgatelyclark.com>
Date:   Wed Nov 11 21:54:17 2015 -0800

    fix merge

 debian/changelog                                   |   5 +-
 debian/patches/series                              |   1 +
 .../upstream_fix_making_bluez_asynchronous.diff    | 217 +++++++++++++++++++++
 3 files changed, 221 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index f0ca558,96b49bb..3fd2c2d
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,16 -1,7 +1,17 @@@
 +plasma-nm (4:5.4.3-0ubuntu1) UNRELEASED; urgency=medium
 +
 +  * Remove upstream applied:
 +    upstream_fix_making_bluez_asynchronous.diff 
 +  * Git remove series file. 
 +  * New upstream bugfix release
++  * Fix merge. 
 +
 + -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 09 Nov 2015 18:40:56 -0800
 +
- plasma-nm (4:5.4.2-0ubuntu1.1) wily; urgency=medium
+ plasma-nm (4:5.4.2-0ubuntu2) xenial; urgency=medium
  
    * Applying patch upstream_fix_making_bluez_asynchronous.diff
-     from upstream to make all bluez calls asynchronous, patch 
+     from upstream to make all bluez calls asynchronous, patch
      by Jan Grulich jgrulich at redhat.com LP: #1509334
  
   -- Clive Johnston <clivejo at aol.com>  Mon, 26 Oct 2015 16:14:16 +0000

-- 
plasma-nm packaging