[SCM] networkmanager-qt packaging branch, master, updated. debian/5.28.0-1-6-gcd3dbe6

Maximiliano Curia maxy at moszumanska.debian.org
Sat Apr 8 08:47:18 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/networkmanager-qt.git;a=commitdiff;h=cd3040d

The following commit has been merged in the master branch:
commit cd3040d7e121593ddf439d94f6f02dddf878d145
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Apr 7 19:12:44 2017 +0200

    Pick "Don't force logging with setFilterRules" (87273f5)
    
    Add upstream patch as: Don-t-force-logging-with-setFilterRules.patch
    
    Gbp-Dch: Full
---
 .../Don-t-force-logging-with-setFilterRules.patch  | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 27 insertions(+)

diff --git a/debian/patches/Don-t-force-logging-with-setFilterRules.patch b/debian/patches/Don-t-force-logging-with-setFilterRules.patch
new file mode 100644
index 0000000..005b690
--- /dev/null
+++ b/debian/patches/Don-t-force-logging-with-setFilterRules.patch
@@ -0,0 +1,26 @@
+From: David Rosca <nowrep at gmail.com>
+Date: Mon, 12 Dec 2016 10:15:40 +0100
+Subject: Don't force logging with setFilterRules
+
+Don't set the logging rules from inside the library, so the user
+configuration (qtlogging.ini) is respected.
+
+REVIEW: 129630
+---
+ src/manager.cpp | 3 ---
+ 1 file changed, 3 deletions(-)
+
+diff --git a/src/manager.cpp b/src/manager.cpp
+index 6565299..c523e13 100644
+--- a/src/manager.cpp
++++ b/src/manager.cpp
+@@ -90,9 +90,6 @@ NetworkManager::NetworkManagerPrivate::NetworkManagerPrivate()
+     , m_isWwanHardwareEnabled(false)
+     , m_supportedInterfaceTypes(NetworkManager::Device::UnknownType)
+ {
+-    QLoggingCategory::setFilterRules(QStringLiteral("networkmanager-qt.debug = true"));
+-    QLoggingCategory::setFilterRules(QStringLiteral("networkmanager-qt.warning = true"));
+-
+     connect(&iface, &OrgFreedesktopNetworkManagerInterface::DeviceAdded,
+             this, &NetworkManagerPrivate::onDeviceAdded);
+     connect(&iface, &OrgFreedesktopNetworkManagerInterface::DeviceRemoved,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..feb0249
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Don-t-force-logging-with-setFilterRules.patch

-- 
networkmanager-qt packaging



More information about the pkg-kde-commits mailing list