[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-3-11-gf1ece5c

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 7168f5202b45a2f6b8817197418ba58e045df1b5
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Oct 18 12:15:10 2010 +0300

    Relay changes from Sune: fix a bug in 99_solid_network_use_ntrack.diff patch.
---
 debian/changelog                                |    3 +++
 debian/patches/99_solid_network_use_ntrack.diff |    6 +++---
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 40d6c82..9579906 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,9 @@ kdebase-workspace (4:4.4.5-4~pre1) UNRELEASED; urgency=low
     with autostart of plasma-netbook. The fix is needed for kde-plasma-netbook
     metapackage to be useful. (Closes: #584905)
 
+  [ Sune Vuorela ]
+  * Fix a bug in 99_solid_network_use_ntrack.diff patch.
+
  -- Frederik Schwarzer <schwarzerf at gmail.com>  Sun, 26 Sep 2010 16:17:42 +0200
 
 kdebase-workspace (4:4.4.5-3) unstable; urgency=low
diff --git a/debian/patches/99_solid_network_use_ntrack.diff b/debian/patches/99_solid_network_use_ntrack.diff
index c4bd7c8..1926f8c 100644
--- a/debian/patches/99_solid_network_use_ntrack.diff
+++ b/debian/patches/99_solid_network_use_ntrack.diff
@@ -2,7 +2,8 @@ From: Sune Vuorela <sune at debian.org>
 Subject: Use ntrack in solidnetwork
 Origin: vendor
 Forwarded: yes
-Last-Update: 2010-08-09
+Last-Update: 2010-10-18
+Applied-Upstream: 4.6 http://websvn.kde.org/?view=revision&revision=1180766
 
 By default, solidnetworkstatus trusts networkmanager too much. NetworkManager reports offline, if
 all devices managed by NM is offline. But there might be devices that aren't managed by NM.
@@ -16,7 +17,7 @@ reports online as status.
 Patch forwarded, hopefully it will soon be applied
 --- /dev/null
 +++ b/solid/networking/kded/ntracknetworkstate.cpp
-@@ -0,0 +1,74 @@
+@@ -0,0 +1,73 @@
 +/*
 +    Copyright (c) 2010 Sune Vuorela <sune at debian.org>
 +
@@ -79,7 +80,6 @@ Patch forwarded, hopefully it will soon be applied
 +
 +NtrackNetworkState::~NtrackNetworkState()
 +{
-+    m_statusmodule->setNetworkStatus("ntrack",Solid::Networking::Unknown);
 +}
 +
 +

-- 
KDE Base Workspace module packaging