[SCM] networkmanager-qt packaging branch, kubuntu_wily_backports, updated. ubuntu/5.15.0-0ubuntu2-20-g22ae403

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/networkmanager-qt.git;a=commitdiff;h=8d78c40

The following commit has been merged in the kubuntu_wily_backports branch:
commit 8d78c404b83e5ff8599c3d6617072b6fdea0afd6
Author: Bhushan Shah <bhush94 at gmail.com>
Date:   Sun Jan 3 16:39:48 2016 +0530

    Build-dep to alternate libnm-glib-dev for vivid builds
---
 debian/changelog | 4 ++++
 debian/control   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 9a05d01..b9b5702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,12 @@
 networkmanager-qt (5.17.0-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ Scarlett Clark ]
   * Debian merge. No remaining changes. 
   * New upstream release Xenial
 
+  [ Bhushan Shah ]
+  * Build-dep to alternate libnm-glib-dev for vivid builds
+
  -- Scarlett Clark <sgclark at kubuntu.org>  Mon, 14 Dec 2015 02:37:47 +0000
 
 networkmanager-qt (5.16.0-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 8007cfc..0f7182f 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake (>= 2.8.12),
                debhelper (>= 9),
                extra-cmake-modules (>= 5.16.0~),
-               libnm-dev (>= 0.9.10.0),
+               libnm-dev (>= 0.9.10.0) | libnm-glib-dev,
                libnm-util-dev (>= 0.9.10.0),
                network-manager-dev (>= 0.9.8.4),
                pkg-config,

-- 
networkmanager-qt packaging