[SCM] plasma-nm packaging branch, master, updated. debian/0.9.3.3-3-5-gd1fca72

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e33b9ab4653d844471a08739b03298a759484a23
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Jul 17 14:01:59 2014 +0200

    New patch: disable_teamwidget
---
 debian/changelog                  |  1 +
 debian/patches/disable_teamwidget | 52 +++++++++++++++++++++++++++++++++++++++
 debian/patches/series             |  1 +
 3 files changed, 54 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 99208ce..e91ea70 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ plasma-nm (0.9.3.3-4) UNRELEASED; urgency=medium
 
   * Update Homepage field. (Closes: #753279)
   * Fix wrong replaces breaks versions. (Closes: #754604, #754979)
+  * New patch: disable_teamwidget
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 02 Jul 2014 11:27:15 +0200
 
diff --git a/debian/patches/disable_teamwidget b/debian/patches/disable_teamwidget
new file mode 100644
index 0000000..046cf4e
--- /dev/null
+++ b/debian/patches/disable_teamwidget
@@ -0,0 +1,52 @@
+Index: plasma-nm/lib/editor/connectiondetaileditor.cpp
+===================================================================
+--- plasma-nm.orig/lib/editor/connectiondetaileditor.cpp	2014-07-17 14:52:26.327086121 +0200
++++ plasma-nm/lib/editor/connectiondetaileditor.cpp	2014-07-17 14:52:26.323086278 +0200
+@@ -39,7 +39,7 @@
+ #include <vlanwidget.h>
+ #include <wimaxwidget.h>
+ #if NM_CHECK_VERSION(0, 9, 9)
+-#include <teamwidget.h>
++/* Should check for NETWORKMANAGERQT_VERSION: #include <teamwidget.h> */
+ #endif
+ #include "vpnuiplugin.h"
+ 
+@@ -315,9 +315,9 @@
+         VlanWidget * vlanWidget = new VlanWidget(m_connection->setting(NetworkManager::Setting::Vlan), this);
+         m_ui->tabWidget->addTab(vlanWidget, i18n("Vlan"));
+ #if NM_CHECK_VERSION(0, 9, 9)
+-    } else if (type == NetworkManager::ConnectionSettings::Team) { // Team
+-        TeamWidget * teamWidget = new TeamWidget(uuid, m_connection->setting(NetworkManager::Setting::Team), this);
+-        m_ui->tabWidget->addTab(teamWidget, i18n("Team"));
++    // } else if (type == NetworkManager::ConnectionSettings::Team) { // Team
++    //    TeamWidget * teamWidget = new TeamWidget(uuid, m_connection->setting(NetworkManager::Setting::Team), this);
++    //    m_ui->tabWidget->addTab(teamWidget, i18n("Team"));
+ #endif
+     } else if (type == NetworkManager::ConnectionSettings::Wimax) { // Wimax
+         WimaxWidget * wimaxWidget = new WimaxWidget(m_connection->setting(NetworkManager::Setting::Wimax), this);
+@@ -370,7 +370,7 @@
+          || type == ConnectionSettings::Infiniband
+          || type == ConnectionSettings::Wimax
+      #if NM_CHECK_VERSION(0, 9, 9)
+-         || type == ConnectionSettings::Team
++     //    || type == ConnectionSettings::Team
+      #endif
+          || type == ConnectionSettings::Bond
+          || type == ConnectionSettings::Bridge
+Index: plasma-nm/editor/connectioneditor.cpp
+===================================================================
+--- plasma-nm.orig/editor/connectioneditor.cpp	2014-07-17 14:52:18.143408479 +0200
++++ plasma-nm/editor/connectioneditor.cpp	2014-07-17 14:53:34.792386343 +0200
+@@ -118,9 +118,9 @@
+     action->setData(NetworkManager::ConnectionSettings::Vlan);
+     m_menu->addAction(action);
+ #if NM_CHECK_VERSION(0, 9, 9)
+-    action = new QAction(i18n("Team"), this);
+-    action->setData(NetworkManager::ConnectionSettings::Team);
+-    m_menu->addAction(action);
++    // action = new QAction(i18n("Team"), this);
++    // action->setData(NetworkManager::ConnectionSettings::Team);
++    // m_menu->addAction(action);
+ #endif
+ 
+     action = m_menu->addSeparator();
diff --git a/debian/patches/series b/debian/patches/series
index 3e803b1..1ad9829 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 upstream_fix_build_new_openconnnect
+disable_teamwidget

-- 
plasma-nm packaging