[SCM] networkmanager-qt packaging branch, kubuntu_unstable_utopic, updated. 20401e4a15515f425a49139b96b63290d1455565

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable_utopic branch:
commit 20401e4a15515f425a49139b96b63290d1455565
Merge: 8698e26c669bd2b72a32cb2563cec666112aa7ea dd0bb99a29a5760cead2523ef1e775be105d1534
Author: Harald Sitter <sitter at kde.org>
Date:   Fri Feb 27 09:42:34 2015 +0100

    Merge branch 'kubuntu_unstable' into kubuntu_unstable_utopic
    
    Conflicts:
    	debian/control

 debian/control | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --cc debian/control
index 7a71685,823c4e1..c14e042
--- a/debian/control
+++ b/debian/control
@@@ -4,10 -4,10 +4,10 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Build-Depends: cmake,
                 debhelper (>= 9.0.0),
                 extra-cmake-modules (>= 1.7.0),
 -               libnm-glib-dev (>= 0.9.10.0),
 -               libnm-util-dev (>= 0.9.10.0),
 +               libnm-glib-dev,
 +               libnm-util-dev,
-                pkg-kde-tools (>= 0.15.15ubuntu1~),
                 pkg-config,
+                pkg-kde-tools (>= 0.15.15ubuntu1~),
                 qtbase5-dev
  Standards-Version: 3.9.5
  Section: libs

-- 
networkmanager-qt packaging