[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=527d970

The following commit has been merged in the master branch:
commit 527d970c8cc57e64549a5c5053c32c2d4fadb2f6
Merge: 4afe49c6d8e89c228bb2ef509152ccd53eda1e2d c3bb0228b3cdc66556a26d704014860de29b5007
Author: Rohan Garg <rohan at garg.io>
Date:   Tue Jun 30 17:17:58 2015 +0200

    Merge branch 'master' into kubuntu_unstable
    
    Conflicts:
    	debian/changelog
    	debian/control

 debian/changelog                         | 9 +++++++++
 debian/control                           | 7 ++++++-
 debian/libkf5networkmanagerqt-dev.acc.in | 1 +
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --cc debian/changelog
index 2e253a1,41c2d62..93044b5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,20 -1,11 +1,28 @@@
+ networkmanager-qt (5.11.0-1) unstable; urgency=medium
+ 
+   * New upstream release (5.10.0).
+   * Update symbols files.
+   * New upstream release (5.11.0).
+ 
+  -- Maximiliano Curia <maxy at debian.org>  Fri, 26 Jun 2015 17:30:42 +0200
+ 
 +networkmanager-qt (5.10.0-0ubuntu2) wily; urgency=medium
 +
 +  * Merge in symbols change
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Fri, 05 Jun 2015 00:48:46 +0200
 +
 +networkmanager-qt (5.10.0-0ubuntu1) wily; urgency=medium
 +
 +  [ Maximiliano Curia ]
 +  * New upstream release (5.10.0).
 +  * Update symbols files.
 +
 +  [ Jonathan Riddell ]
 +  * New upstream release
 +
 + -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 03 Jun 2015 20:59:03 +0200
 +
  networkmanager-qt (5.9.0-1) experimental; urgency=medium
  
    * New upstream release (5.9.0).
@@@ -92,3 -83,3 +100,4 @@@ libnm-qt (5.0.93-0ubuntu1) utopic; urge
    * Remove no-human-maintainers lintian-override per ScottK.
  
   -- Scarlett Clark <sgclark at kubuntu.org>  Thu, 18 Sep 2014 07:22:50 -0700
++
diff --cc debian/control
index be4fd47,a73761e..a42225b
--- a/debian/control
+++ b/debian/control
@@@ -5,8 -5,8 +5,13 @@@ Maintainer: Debian/Kubuntu Qt/KDE Maint
  Uploaders: Maximiliano Curia <maxy at debian.org>
  Build-Depends: cmake (>= 2.8.12),
                 debhelper (>= 9),
++<<<<<<< HEAD
 +               extra-cmake-modules (>= 5.10.0),
 +               libnm-glib-dev (>= 0.9.10.0),
++=======
+                extra-cmake-modules (>= 5.11.0~),
+                libnm-dev (>= 0.9.10.0),
++>>>>>>> master
                 libnm-util-dev (>= 0.9.10.0),
                 network-manager-dev (>= 0.9.8.4),
                 pkg-config,

-- 
networkmanager-qt packaging