[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=e588c5e

The following commit has been merged in the kubuntu_stable branch:
commit e588c5e36e084531828be53cefbc00b3a1d357bd
Author: Bhushan Shah <bhush94 at gmail.com>
Date:   Wed Jan 20 13:36:04 2016 +0530

    alternate depend on libnm-glib-dev for vivid mobile builds
---
 debian/changelog | 3 +++
 debian/control   | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index a2a05d1..492d651 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,9 @@ plasma-nm (4:5.5.3-0ubuntu1) UNRELEASED; urgency=medium
   [ Scarlett Clark ]
   * Debian merge, No remaining changes. 
 
+  [ Bhushan Shah ]
+  * Alternate depend on libnm-glib-dev for vivid mobile builds
+
  -- Clive Johnston <clivejo at aol.com>  Thu, 07 Jan 2016 18:01:13 +0000
 
 plasma-nm (4:5.4.3-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index c3cc017..483e04d 100644
--- a/debian/control
+++ b/debian/control
@@ -26,7 +26,7 @@ Build-Depends: cmake (>= 2.8.12~),
                libkf5widgetsaddons-dev,
                libkf5windowsystem-dev,
                libkf5xmlgui-dev,
-               libnm-dev (>= 0.9.8.4),
+               libnm-dev (>= 0.9.8.4) | libnm-glib-dev,
                libopenconnect-dev (>= 3.99~),
                libqca-qt5-2-dev (>= 2.1.0),
                mobile-broadband-provider-info,

-- 
plasma-nm packaging