[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=6c9aea5

The following commit has been merged in the master branch:
commit 6c9aea52ed7e7be2c1fc24237550b5b2818642a5
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Oct 13 12:05:18 2016 +0200

    squash excess delta with debian
    
    - control diff was to sustain vivid builds which we don't do anymore
    - symbols diff is vastly useless as we don't use symbols right now
---
 debian/control                         | 4 ++--
 debian/libkf5networkmanagerqt6.symbols | 6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 97f56fa..774b874 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.26.0~),
-               libnm-dev (>= 0.9.10.0) | libnm-glib-dev,
+               libnm-dev (>= 0.9.10.0),
                libnm-util-dev (>= 0.9.10.0),
                network-manager-dev (>= 0.9.10.0~),
                pkg-config,
@@ -21,7 +21,7 @@ Package: libkf5networkmanagerqt-dev
 Section: libdevel
 Architecture: any
 Depends: libkf5networkmanagerqt6 (= ${binary:Version}),
-         libnm-dev (>= 0.9.10.0) | libnm-glib-dev,
+         libnm-dev (>= 0.9.10.0),
          qtbase5-dev (>= 5.5.0~),
          ${misc:Depends},
          ${shlibs:Depends}
diff --git a/debian/libkf5networkmanagerqt6.symbols b/debian/libkf5networkmanagerqt6.symbols
index 4e32c9f..f8978fd 100644
--- a/debian/libkf5networkmanagerqt6.symbols
+++ b/debian/libkf5networkmanagerqt6.symbols
@@ -150,6 +150,7 @@ libKF5NetworkManagerQt.so.6 libkf5networkmanagerqt6 #MINVER#
  _ZN14NetworkManager11AccessPoint11qt_metacastEPKc at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager11AccessPoint11ssidChangedERK7QString at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager11AccessPoint14bitRateChangedEi at Base 5.1.1+git20141203.0020+15.04
+ _ZN14NetworkManager11AccessPoint15lastSeenChangedEi at Base 5.14.0
  _ZN14NetworkManager11AccessPoint15rsnFlagsChangedE6QFlagsINS0_7WpaFlagEE at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager11AccessPoint15wpaFlagsChangedE6QFlagsINS0_7WpaFlagEE at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager11AccessPoint16frequencyChangedEj at Base 5.1.1+git20141203.0020+15.04
@@ -780,6 +781,7 @@ libKF5NetworkManagerQt.so.6 libkf5networkmanagerqt6 #MINVER#
  _ZN14NetworkManager6Device12stateChangedENS0_5StateES1_NS0_17StateChangeReasonE at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager6Device13driverChangedEv at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager6Device14managedChangedEv at Base 5.1.1+git20141203.0020+15.04
+ _ZN14NetworkManager6Device14meteredChangedENS0_13MeteredStatusE at Base 5.14.0
  _ZN14NetworkManager6Device14setAutoconnectEb at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager6Device15deleteInterfaceEv at Base 5.10.0
  _ZN14NetworkManager6Device16staticMetaObjectE at Base 5.1.1+git20141203.0020+15.04
@@ -835,6 +837,7 @@ libKF5NetworkManagerQt.so.6 libkf5networkmanagerqt6 #MINVER#
  _ZN14NetworkManager7SettingD0Ev at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager7SettingD1Ev at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager7SettingD2Ev at Base 5.1.1+git20141203.0020+15.04
+ _ZN14NetworkManager7meteredEv at Base 5.14.0
  _ZN14NetworkManager7versionEv at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager8IpConfig11setIPv4PathERK7QString at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager8IpConfig11setIPv6PathERK7QString at Base 5.1.1+git20141203.0020+15.04
@@ -852,6 +855,7 @@ libKF5NetworkManagerQt.so.6 libkf5networkmanagerqt6 #MINVER#
  _ZN14NetworkManager8Notifier11qt_metacastEPKc at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager8Notifier13deviceRemovedERK7QString at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager8Notifier13statusChangedENS_6StatusE at Base 5.1.1+git20141203.0020+15.04
+ _ZN14NetworkManager8Notifier14meteredChangedENS_6Device13MeteredStatusE at Base 5.14.0
  _ZN14NetworkManager8Notifier15serviceAppearedEv at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager8Notifier16staticMetaObjectE at Base 5.1.1+git20141203.0020+15.04
  _ZN14NetworkManager8Notifier18serviceDisappearedEv at Base 5.1.1+git20141203.0020+15.04
@@ -1062,6 +1066,7 @@ libKF5NetworkManagerQt.so.6 libkf5networkmanagerqt6 #MINVER#
  _ZNK14NetworkManager11AccessPoint4modeEv at Base 5.1.1+git20141203.0020+15.04
  _ZNK14NetworkManager11AccessPoint4ssidEv at Base 5.1.1+git20141203.0020+15.04
  _ZNK14NetworkManager11AccessPoint7rawSsidEv at Base 5.1.1+git20141203.0020+15.04
+ _ZNK14NetworkManager11AccessPoint8lastSeenEv at Base 5.14.0
  _ZNK14NetworkManager11AccessPoint8rsnFlagsEv at Base 5.1.1+git20141203.0020+15.04
  _ZNK14NetworkManager11AccessPoint8wpaFlagsEv at Base 5.1.1+git20141203.0020+15.04
  _ZNK14NetworkManager11AccessPoint9frequencyEv at Base 5.1.1+git20141203.0020+15.04
@@ -1409,6 +1414,7 @@ libKF5NetworkManagerQt.so.6 libkf5networkmanagerqt6 #MINVER#
  _ZNK14NetworkManager6Device6driverEv at Base 5.1.1+git20141203.0020+15.04
  _ZNK14NetworkManager6Device7isValidEv at Base 5.1.1+git20141203.0020+15.04
  _ZNK14NetworkManager6Device7managedEv at Base 5.1.1+git20141203.0020+15.04
+ _ZNK14NetworkManager6Device7meteredEv at Base 5.14.0
  _ZNK14NetworkManager6Device8isActiveEv at Base 5.1.1+git20141203.0020+15.04
  _ZNK14NetworkManager7IpRoute10setNextHopERK12QHostAddress at Base 5.1.1+git20141203.0020+15.04
  _ZNK14NetworkManager7IpRoute6metricEv at Base 5.1.1+git20141203.0020+15.04

-- 
networkmanager-qt packaging