[SCM] plasma-nm packaging branch, master, updated. debian/0.9.3.6-1
Felix Geyer
fgeyer at moszumanska.debian.org
Mon May 18 18:41:04 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/plasma-nm.git;a=commitdiff;h=7aac98e
The following commit has been merged in the master branch:
commit 7aac98edeb7cacc6975ecc3e2f32cc1f8f027876
Author: Felix Geyer <fgeyer at debian.org>
Date: Mon May 18 19:34:22 2015 +0200
New upstream release.
* New upstream release.
- Fixes a crash in the connection editor. (Closes: #777052)
- Drop all patches. They are applied upstream.
---
debian/changelog | 9 ++
debian/patches/series | 3 -
debian/patches/upstream-delay_the_notifications | 134 ------------------------
debian/patches/upstream-fix_build_replace | 46 --------
debian/patches/upstream-use_proper_kded | 19 ----
5 files changed, 9 insertions(+), 202 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 5bf3e18..377c2d9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+plasma-nm (0.9.3.6-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release. (Closes: #784154)
+ - Fixes a crash in the connection editor. (Closes: #777052)
+ - Drop all patches. They are applied upstream.
+
+ -- Felix Geyer <fgeyer at debian.org> Mon, 18 May 2015 19:12:53 +0200
+
plasma-nm (0.9.3.4-2) unstable; urgency=medium
* New patch: upstream-delay_the_notifications (Closes: #758863) Thanks
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 700ad47..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,3 +0,0 @@
-upstream-delay_the_notifications
-upstream-use_proper_kded
-upstream-fix_build_replace
diff --git a/debian/patches/upstream-delay_the_notifications b/debian/patches/upstream-delay_the_notifications
deleted file mode 100644
index eddacfc..0000000
--- a/debian/patches/upstream-delay_the_notifications
+++ /dev/null
@@ -1,134 +0,0 @@
-commit 81839a1566d0c0209a308d71b03837f996a19c96
-Author: Lukáš Tinkl <lukas at kde.org>
-Date: Sat Sep 6 17:54:00 2014 +0200
-
- delay the notifications and secret agent initializations until needed
-
- BUG:338513
- REVIEW:120082
-
-Index: plasma-nm/kded/service.cpp
-===================================================================
---- plasma-nm.orig/kded/service.cpp 2014-09-15 09:53:43.409980948 +0200
-+++ plasma-nm/kded/service.cpp 2014-09-15 09:53:43.369982542 +0200
-@@ -57,19 +57,13 @@
- {
- Q_D(NetworkManagementService);
-
-- QDBusReply<bool> notificationsReply = QDBusConnection::sessionBus().interface()->isServiceRegistered("org.freedesktop.Notifications");
-- if (notificationsReply.value()) {
-- initializeNotifications();
-- } else {
-- QDBusServiceWatcher * watcher = new QDBusServiceWatcher("org.freedesktop.Notifications", QDBusConnection::sessionBus(), QDBusServiceWatcher::WatchForOwnerChange, this);
-- connect(watcher, SIGNAL(serviceRegistered()), this, SLOT(doInitializeNotifications()));
-- }
-+ d->agent = Q_NULLPTR;
-+ d->notification = Q_NULLPTR;
-
- #if WITH_MODEMMANAGER_SUPPORT
-- d->modemMonitor = new ModemMonitor(this);
-+ d->modemMonitor = Q_NULLPTR;
- #endif
-- d->bluetoothMonitor = new BluetoothMonitor(this);
-- d->agent = new SecretAgent(this);
-+ d->bluetoothMonitor = Q_NULLPTR;
- }
-
- NetworkManagementService::~NetworkManagementService()
-@@ -77,17 +71,25 @@
- delete d_ptr;
- }
-
--void NetworkManagementService::doInitializeNotifications()
-+void NetworkManagementService::init()
- {
-- QDBusServiceWatcher * watcher = static_cast<QDBusServiceWatcher*>(sender());
-- watcher->deleteLater();
-+ Q_D(NetworkManagementService);
-
-- initializeNotifications();
--}
-+ if (!d->agent) {
-+ d->agent = new SecretAgent(this);
-+ }
-
--void NetworkManagementService::initializeNotifications()
--{
-- Q_D(NetworkManagementService);
-+ if (!d->notification) {
-+ d->notification = new Notification(this);
-+ }
-+
-+#if WITH_MODEMMANAGER_SUPPORT
-+ if (!d->modemMonitor) {
-+ d->modemMonitor = new ModemMonitor(this);
-+ }
-+#endif
-
-- d->notification = new Notification(this);
-+ if (!d->bluetoothMonitor) {
-+ d->bluetoothMonitor = new BluetoothMonitor(this);
-+ }
- }
-Index: plasma-nm/kded/service.h
-===================================================================
---- plasma-nm.orig/kded/service.h 2014-09-15 09:53:43.409980948 +0200
-+++ plasma-nm/kded/service.h 2014-09-15 09:53:43.369982542 +0200
-@@ -35,18 +35,18 @@
-
- class PLASMA_NM_EXPORT NetworkManagementService : public KDEDModule
- {
-+ Q_CLASSINFO("D-Bus Interface", "org.kde.plasmanetworkmanagement")
- Q_OBJECT
- Q_DECLARE_PRIVATE(NetworkManagementService)
- public:
- NetworkManagementService(QObject * parent, const QVariantList&);
- virtual ~NetworkManagementService();
-+
- public Q_SLOTS:
-- void doInitializeNotifications();
-+ Q_SCRIPTABLE void init();
-
- private:
- NetworkManagementServicePrivate * d_ptr;
--
-- void initializeNotifications();
- };
-
- #endif // PLASMANM_KDED_SERVICE_H
-Index: plasma-nm/libs/handler.cpp
-===================================================================
---- plasma-nm.orig/libs/handler.cpp 2014-09-15 09:53:43.409980948 +0200
-+++ plasma-nm/libs/handler.cpp 2014-09-15 09:53:43.369982542 +0200
-@@ -52,7 +52,10 @@
- , m_tmpWimaxEnabled(NetworkManager::isWimaxEnabled())
- , m_tmpWirelessEnabled(NetworkManager::isWirelessEnabled())
- , m_tmpWwanEnabled(NetworkManager::isWwanEnabled())
-+ , m_agentIface(QStringLiteral("org.kde.kded5"), QStringLiteral("/modules/networkmanagement"),
-+ QStringLiteral("org.kde.plasmanetworkmanagement"))
- {
-+ m_agentIface.call(QStringLiteral("init"));
- }
-
- Handler::~Handler()
-Index: plasma-nm/libs/handler.h
-===================================================================
---- plasma-nm.orig/libs/handler.h 2014-09-15 09:53:43.409980948 +0200
-+++ plasma-nm/libs/handler.h 2014-09-15 09:53:43.369982542 +0200
-@@ -21,6 +21,8 @@
- #ifndef PLASMA_NM_HANDLER_H
- #define PLASMA_NM_HANDLER_H
-
-+#include <QDBusInterface>
-+
- #include <NetworkManagerQt/Connection>
-
- #include "plasmanm_export.h"
-@@ -109,6 +111,7 @@
- QString m_tmpSpecificPath;
-
- bool isBtEnabled();
-+ QDBusInterface m_agentIface;
- };
-
- #endif // PLASMA_NM_HANDLER_H
diff --git a/debian/patches/upstream-fix_build_replace b/debian/patches/upstream-fix_build_replace
deleted file mode 100644
index e7e9eb3..0000000
--- a/debian/patches/upstream-fix_build_replace
+++ /dev/null
@@ -1,46 +0,0 @@
-commit fd26f6e00b115912b8355f292f15eb197420fb6d
-Author: Jan Grulich <jgrulich at redhat.com>
-Date: Sun Sep 7 11:26:47 2014 +0200
-
- Fix build: replace Qt5 stuff
-
-Index: plasma-nm/kded/service.cpp
-===================================================================
---- plasma-nm.orig/kded/service.cpp 2014-09-15 09:53:57.601414845 +0200
-+++ plasma-nm/kded/service.cpp 2014-09-15 09:53:57.597415005 +0200
-@@ -57,13 +57,13 @@
- {
- Q_D(NetworkManagementService);
-
-- d->agent = Q_NULLPTR;
-- d->notification = Q_NULLPTR;
-+ d->agent = 0;
-+ d->notification = 0;
-
- #if WITH_MODEMMANAGER_SUPPORT
-- d->modemMonitor = Q_NULLPTR;
-+ d->modemMonitor = 0;
- #endif
-- d->bluetoothMonitor = Q_NULLPTR;
-+ d->bluetoothMonitor = 0;
- }
-
- NetworkManagementService::~NetworkManagementService()
-Index: plasma-nm/libs/handler.cpp
-===================================================================
---- plasma-nm.orig/libs/handler.cpp 2014-09-15 09:53:57.601414845 +0200
-+++ plasma-nm/libs/handler.cpp 2014-09-15 09:53:57.597415005 +0200
-@@ -52,10 +52,10 @@
- , m_tmpWimaxEnabled(NetworkManager::isWimaxEnabled())
- , m_tmpWirelessEnabled(NetworkManager::isWirelessEnabled())
- , m_tmpWwanEnabled(NetworkManager::isWwanEnabled())
-- , m_agentIface(QStringLiteral("org.kde.kded"), QStringLiteral("/modules/networkmanagement"),
-- QStringLiteral("org.kde.plasmanetworkmanagement"))
-+ , m_agentIface(QLatin1String("org.kde.kded"), QLatin1String("/modules/networkmanagement"),
-+ QLatin1String("org.kde.plasmanetworkmanagement"))
- {
-- m_agentIface.call(QStringLiteral("init"));
-+ m_agentIface.call(QLatin1String("init"));
- }
-
- Handler::~Handler()
diff --git a/debian/patches/upstream-use_proper_kded b/debian/patches/upstream-use_proper_kded
deleted file mode 100644
index 4b4d003..0000000
--- a/debian/patches/upstream-use_proper_kded
+++ /dev/null
@@ -1,19 +0,0 @@
-commit c48c8321bca526787959c6ca5cb6d92c8b42882e
-Author: Jan Grulich <jgrulich at redhat.com>
-Date: Sun Sep 7 11:23:18 2014 +0200
-
- Use proper kded service name
-
-Index: plasma-nm/libs/handler.cpp
-===================================================================
---- plasma-nm.orig/libs/handler.cpp 2014-09-15 09:53:54.745528768 +0200
-+++ plasma-nm/libs/handler.cpp 2014-09-15 09:53:54.741528928 +0200
-@@ -52,7 +52,7 @@
- , m_tmpWimaxEnabled(NetworkManager::isWimaxEnabled())
- , m_tmpWirelessEnabled(NetworkManager::isWirelessEnabled())
- , m_tmpWwanEnabled(NetworkManager::isWwanEnabled())
-- , m_agentIface(QStringLiteral("org.kde.kded5"), QStringLiteral("/modules/networkmanagement"),
-+ , m_agentIface(QStringLiteral("org.kde.kded"), QStringLiteral("/modules/networkmanagement"),
- QStringLiteral("org.kde.plasmanetworkmanagement"))
- {
- m_agentIface.call(QStringLiteral("init"));
--
plasma-nm packaging
More information about the pkg-kde-commits
mailing list