[SCM] networkmanager-qt packaging branch, kubuntu_unstable_utopic, updated. 68b5ce5dc57c7c7679d4f44825fea6b3323ad1bf

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable_utopic branch:
commit 68b5ce5dc57c7c7679d4f44825fea6b3323ad1bf
Merge: 631ae58f7a238dceab043617d00fdeeba885bd5c c6a68014ba1b329ad1fa194897d55eb55577e2c6
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Feb 9 14:18:24 2015 +0100

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

 debian/control | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --cc debian/control
index 5ac2fbd,bc01893..7a71685
--- a/debian/control
+++ b/debian/control
@@@ -3,9 -3,9 +3,9 @@@ Priority: extr
  Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Build-Depends: cmake,
                 debhelper (>= 9.0.0),
-                extra-cmake-modules (>= 1.6.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,
                 qtbase5-dev

-- 
networkmanager-qt packaging