[SCM] networkmanager-qt packaging branch, master, updated. debian/5.37.0-2-117-gf1fbbd9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 12f1a452c8b886866e7f098acca3433f0f23d0c0
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Sep 21 16:13:18 2015 +0100

    Build-dep and depend from libkf5networkmanagerqt-dev on alternate libnm-glib-dev for vivid builds for mobile kci
---
 debian/changelog | 7 +++++++
 debian/control   | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 074f5ce..735ee7c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+networkmanager-qt (5.14.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * Build-dep and depend from libkf5networkmanagerqt-dev on alternate
+    libnm-glib-dev for vivid builds for mobile kci
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Mon, 21 Sep 2015 16:12:34 +0100
+
 networkmanager-qt (5.14.0-0ubuntu1) wily; urgency=medium
 
   * new upstream release
diff --git a/debian/control b/debian/control
index 0014782..21508a7 100644
--- a/debian/control
+++ b/debian/control
@@ -21,7 +21,7 @@ Package: libkf5networkmanagerqt-dev
 Section: libdevel
 Architecture: any
 Depends: libkf5networkmanagerqt6 (= ${binary:Version}),
-         libnm-dev (>= 0.9.10.0),
+         libnm-dev (>= 0.9.10.0) | libnm-glib-dev,
          qtbase5-dev (>= 5.4),
          ${misc:Depends},
          ${shlibs:Depends}

-- 
networkmanager-qt packaging