[SCM] plasma-nm packaging branch, master, updated. debian/5.2.2-2-6-gde6f36e

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/plasma-nm.git;a=commitdiff;h=ebc5752

The following commit has been merged in the master branch:
commit ebc57522784c6a774ba5cda9838cdc6252d0e963
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon May 18 10:02:36 2015 +0200

    Remove upstream patch: upstream_fix_newmodemmanager_framework_integration.patch
---
 debian/changelog                                   |  2 +
 debian/patches/series                              |  1 -
 ...fix_newmodemmanager_framework_integration.patch | 83 ----------------------
 3 files changed, 2 insertions(+), 84 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b069931..bd7fa7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 plasma-nm (4:5.3.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.3.0).
+  * Remove upstream patch:
+    upstream_fix_newmodemmanager_framework_integration.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Tue, 12 May 2015 20:07:32 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 3f0b193..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_fix_newmodemmanager_framework_integration.patch 
diff --git a/debian/patches/upstream_fix_newmodemmanager_framework_integration.patch b/debian/patches/upstream_fix_newmodemmanager_framework_integration.patch
deleted file mode 100644
index 40d277c..0000000
--- a/debian/patches/upstream_fix_newmodemmanager_framework_integration.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-From: Jan Grulich <jgrulich at redhat.com>
-Date: Tue, 31 Mar 2015 12:37:16 +0000
-Subject: Adapt to modemmanager-qt API changes
-X-Git-Url: http://quickgit.kde.org/?p=plasma-nm.git&a=commitdiff&h=4d72cb7966edda33bc72c77fc2a126844fc1f134
----
-Adapt to modemmanager-qt API changes
----
-
-
-Index: plasma-nm-5.2.2/libs/models/networkmodel.cpp
-===================================================================
---- plasma-nm-5.2.2.orig/libs/models/networkmodel.cpp
-+++ plasma-nm-5.2.2/libs/models/networkmodel.cpp
-@@ -246,10 +246,10 @@ void NetworkModel::initializeSignals(con
-             if (modem->hasInterface(ModemManager::ModemDevice::ModemInterface)) {
-                 ModemManager::Modem::Ptr modemNetwork = modem->interface(ModemManager::ModemDevice::ModemInterface).objectCast<ModemManager::Modem>();
-                 if (modemNetwork) {
--                    connect(modemNetwork.data(), SIGNAL(signalQualityChanged(uint)),
--                            SLOT(gsmNetworkSignalQualityChanged(uint)), Qt::UniqueConnection);
--                    connect(modemNetwork.data(), SIGNAL(accessTechnologyChanged(ModemManager::Modem::AccessTechnologies)),
--                            SLOT(gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies)), Qt::UniqueConnection);
-+                    connect(modemNetwork.data(), SIGNAL(signalQualityChanged(ModemManager::SignalQualityPair)),
-+                            SLOT(gsmNetworkSignalQualityChanged(ModemManager::SignalQualityPair)), Qt::UniqueConnection);
-+                    connect(modemNetwork.data(), SIGNAL(accessTechnologiesChanged(QFlags<MMModemAccessTechnology>)),
-+                            SLOT(gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology>)), Qt::UniqueConnection);
-                     connect(modemNetwork.data(), SIGNAL(currentModesChanged()),
-                             SLOT(gsmNetworkCurrentModesChanged()), Qt::UniqueConnection);
-                 }
-@@ -854,9 +854,9 @@ void NetworkModel::deviceStateChanged(Ne
- }
- 
- #if WITH_MODEMMANAGER_SUPPORT
--void NetworkModel::gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies technology)
-+void NetworkModel::gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology> accessTechnologies)
- {
--    Q_UNUSED(technology);
-+    Q_UNUSED(accessTechnologies);
-     ModemManager::Modem * gsmNetwork = qobject_cast<ModemManager::Modem*>(sender());
-     if (gsmNetwork) {
-         Q_FOREACH(const NetworkManager::Device::Ptr & dev, NetworkManager::networkInterfaces()) {
-@@ -900,7 +900,7 @@ void NetworkModel::gsmNetworkCurrentMode
-     }
- }
- 
--void NetworkModel::gsmNetworkSignalQualityChanged(uint signal)
-+void NetworkModel::gsmNetworkSignalQualityChanged(const ModemManager::SignalQualityPair &signalQuality)
- {
-     ModemManager::Modem * gsmNetwork = qobject_cast<ModemManager::Modem*>(sender());
-     if (gsmNetwork) {
-@@ -912,7 +912,7 @@ void NetworkModel::gsmNetworkSignalQuali
-                         ModemManager::Modem::Ptr modemNetwork = modem->interface(ModemManager::ModemDevice::ModemInterface).objectCast<ModemManager::Modem>();
-                         if (modemNetwork && modemNetwork->device() == gsmNetwork->device()) {
-                             Q_FOREACH(NetworkModelItem * item, m_list.returnItems(NetworkItemsList::Device, dev->uni())) {
--                                item->setSignal(signal);
-+                                item->setSignal(signalQuality.signal);
-                                 updateItem(item);
-                             }
-                         }
-@@ -1082,7 +1082,7 @@ void NetworkModel::wirelessNetworkSignal
-     if (networkPtr) {
-         Q_FOREACH(NetworkModelItem * item, m_list.returnItems(NetworkItemsList::Ssid, networkPtr->ssid(), networkPtr->device())) {
-             if (item->specificPath() == networkPtr->referenceAccessPoint()->uni()) {
--                item->setSignal(signal);
-+	        item->setSignal(signal);
-                 updateItem(item);
- //              qCDebug(PLASMA_NM) << "Wireless network " << item->name() << ": signal changed to " << item->signal();
-             }
-Index: plasma-nm-5.2.2/libs/models/networkmodel.h
-===================================================================
---- plasma-nm-5.2.2.orig/libs/models/networkmodel.h
-+++ plasma-nm-5.2.2/libs/models/networkmodel.h
-@@ -95,9 +95,9 @@ private Q_SLOTS:
-     void deviceRemoved(const QString& device);
-     void deviceStateChanged(NetworkManager::Device::State state, NetworkManager::Device::State oldState, NetworkManager::Device::StateChangeReason reason);
- #if WITH_MODEMMANAGER_SUPPORT
--    void gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies technology);
-+    void gsmNetworkAccessTechnologiesChanged(QFlags<MMModemAccessTechnology> accessTechnologies);
-     void gsmNetworkCurrentModesChanged();
--    void gsmNetworkSignalQualityChanged(uint signal);
-+    void gsmNetworkSignalQualityChanged(const ModemManager::SignalQualityPair &signalQuality);
- #endif
-     void ipConfigChanged();
-     void ipInterfaceChanged();

-- 
plasma-nm packaging