[SCM] plasma-nm packaging branch, kubuntu_vivid_archive, updated. d36f8145c02d482da56cfd0c0303e726c2b3fc26

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_vivid_archive branch:
commit d36f8145c02d482da56cfd0c0303e726c2b3fc26
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Mon Apr 13 23:50:14 2015 +0200

    releasing package plasma-nm version 4:5.2.2-0ubuntu2
---
 debian/changelog                                   |  2 +-
 ...fix_newmodemmanager_framework_integration.patch | 42 +++++++++++++---------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed561bd..282546f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-plasma-nm (4:5.2.2-0ubuntu2) UNRELEASED; urgency=medium
+plasma-nm (4:5.2.2-0ubuntu2) vivid; urgency=medium
 
   * Add upstream patch upstream_fix_newmodemmanager_framework_integration
   * Fix series file 
diff --git a/debian/patches/upstream_fix_newmodemmanager_framework_integration.patch b/debian/patches/upstream_fix_newmodemmanager_framework_integration.patch
index 4c59f4c..40d277c 100644
--- a/debian/patches/upstream_fix_newmodemmanager_framework_integration.patch
+++ b/debian/patches/upstream_fix_newmodemmanager_framework_integration.patch
@@ -7,9 +7,11 @@ Adapt to modemmanager-qt API changes
 ---
 
 
---- a/libs/models/networkmodel.cpp
-+++ b/libs/models/networkmodel.cpp
-@@ -246,10 +246,10 @@
+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) {
@@ -24,20 +26,19 @@ Adapt to modemmanager-qt API changes
                      connect(modemNetwork.data(), SIGNAL(currentModesChanged()),
                              SLOT(gsmNetworkCurrentModesChanged()), Qt::UniqueConnection);
                  }
-@@ -847,9 +847,9 @@
+@@ -854,9 +854,9 @@ void NetworkModel::deviceStateChanged(Ne
  }
  
  #if WITH_MODEMMANAGER_SUPPORT
 -void NetworkModel::gsmNetworkAccessTechnologyChanged(ModemManager::Modem::AccessTechnologies technology)
--{
--    Q_UNUSED(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()) {
-@@ -893,7 +893,7 @@
+         Q_FOREACH(const NetworkManager::Device::Ptr & dev, NetworkManager::networkInterfaces()) {
+@@ -900,7 +900,7 @@ void NetworkModel::gsmNetworkCurrentMode
      }
  }
  
@@ -46,19 +47,29 @@ Adapt to modemmanager-qt API changes
  {
      ModemManager::Modem * gsmNetwork = qobject_cast<ModemManager::Modem*>(sender());
      if (gsmNetwork) {
-@@ -905,7 +905,7 @@
+@@ -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())) {
+                             Q_FOREACH(NetworkModelItem * item, m_list.returnItems(NetworkItemsList::Device, dev->uni())) {
 -                                item->setSignal(signal);
 +                                item->setSignal(signalQuality.signal);
                                  updateItem(item);
                              }
                          }
-
---- a/libs/models/networkmodel.h
-+++ b/libs/models/networkmodel.h
-@@ -94,9 +94,9 @@
+@@ -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
@@ -70,4 +81,3 @@ Adapt to modemmanager-qt API changes
  #endif
      void ipConfigChanged();
      void ipInterfaceChanged();
-

-- 
plasma-nm packaging