[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-2-1-g5f1cd03

[Sune Vuorela]

The following commit has been merged in the master branch:
commit 5f1cd032d0faf0a8e02d27a0d06265932ecd535c
Author: Sune Vuorela <sune at vuorela.dk>
Date:   Mon Aug 9 23:49:49 2010 +0200

    fix up the ntrack patch to also work without ntrack available. only use ntrack on linux archs
---
 debian/changelog                                |    7 ++++++
 debian/control                                  |    2 +-
 debian/patches/99_solid_network_use_ntrack.diff |   24 ++++++++++++----------
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 331a155..63ec578 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+kdebase-workspace (4:4.4.5-3) unstable; urgency=low
+
+  * Don't use ntrack on !linux. It doesn't work/exist there, and fix
+    patch to actually work in all cases.
+
+ -- Sune Vuorela <sune at debian.org>  Mon, 09 Aug 2010 23:16:59 +0200
+
 kdebase-workspace (4:4.4.5-2) unstable; urgency=low
 
   [ Sune Vuorela ]
diff --git a/debian/control b/debian/control
index ca71890..78bcd95 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: kde-sc-dev-latest (>= 4:4.4.5),
  libsm-dev, libxcursor-dev, libxft-dev, libxtst-dev, libqt4-opengl-dev, libxinerama-dev,
  libxss-dev, libqedje-dev (>= 0.4.0), libggadget-1.0-dev (>= 0.11.2), libggadget-qt-1.0-dev (>= 0.11.2),
  libgps-dev (>= 2.90),
- libntrack-qt4-dev
+ libntrack-qt4-dev [linux-any]
 Standards-Version: 3.8.4
 Homepage: http://www.kde.org/
 Vcs-Browser: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase-workspace.git
diff --git a/debian/patches/99_solid_network_use_ntrack.diff b/debian/patches/99_solid_network_use_ntrack.diff
index cc7be26..7590ff1 100644
--- a/debian/patches/99_solid_network_use_ntrack.diff
+++ b/debian/patches/99_solid_network_use_ntrack.diff
@@ -11,7 +11,7 @@ reports online as status.
 
 Patch forwarded, hopefully it will soon be applied
 --- /dev/null
-+++ kdebase-workspace-4.4.4/solid/networking/kded/ntracknetworkstate.cpp
++++ b/solid/networking/kded/ntracknetworkstate.cpp
 @@ -0,0 +1,74 @@
 +/*
 +    Copyright (c) 2010 Sune Vuorela <sune at debian.org>
@@ -87,8 +87,8 @@ Patch forwarded, hopefully it will soon be applied
 +}
 +
 +
---- kdebase-workspace-4.4.4.orig/solid/networking/kded/CMakeLists.txt
-+++ kdebase-workspace-4.4.4/solid/networking/kded/CMakeLists.txt
+--- a/solid/networking/kded/CMakeLists.txt
++++ b/solid/networking/kded/CMakeLists.txt
 @@ -6,6 +6,20 @@ set(kded_networkstatus_PART_SRCS network
  #    MESSAGE(STATUS "Adding in-process NetworkManager service-wart to kded module")
  #endif(NETWORKMANAGER_FOUND)
@@ -99,28 +99,31 @@ Patch forwarded, hopefully it will soon be applied
 +    MESSAGE(STATUS "Found QNtrack, will use it as a additional data point for KDED network status module")
 +    set(kded_networkstatus_PART_SRCS ${kded_networkstatus_PART_SRCS} ntracknetworkstate.cpp)
 +    add_definitions(-DHAVE_QNTRACK)
++    include_directories(${QNTRACK_INCLUDE_DIR})
 +else(QNTRACK_FOUND)
 +    MESSAGE(STATUS "QNtrack not found. Consider installing it for more data points to network status module. See https://launchpad.net/ntrack")
 +endif(QNTRACK_FOUND)
 +
 +macro_log_feature(QNTRACK_FOUND "QNtrack" "Network status tracking library" "http://launchpad.net/ntrack" FALSE "" "Needed to provide more data points for KDED Networkstatus module")
 +
-+include_directories(${QNTRACK_INCLUDE_DIR})
 +
  qt4_add_dbus_adaptor(kded_networkstatus_PART_SRCS ../org.kde.Solid.Networking.Service.xml
          networkstatus.h NetworkStatusModule)
  
-@@ -17,7 +31,7 @@ qt4_add_dbus_adaptor(kded_networkstatus_
+@@ -17,7 +31,10 @@ qt4_add_dbus_adaptor(kded_networkstatus_
  
  kde4_add_plugin(kded_networkstatus ${kded_networkstatus_PART_SRCS})
  
 -target_link_libraries(kded_networkstatus ${KDE4_KIO_LIBS} solidcontrol)
-+target_link_libraries(kded_networkstatus ${KDE4_KIO_LIBS} solidcontrol ${QNTRACK_LIBRARIES})
++target_link_libraries(kded_networkstatus ${KDE4_KIO_LIBS} solidcontrol )
++if(QNTRACK_FOUND)
++    target_link_libraries(kded_networkstatus ${QNTRACK_LIBRARIES})
++endif(QNTRACK_FOUND)
  
  install(TARGETS kded_networkstatus DESTINATION ${PLUGIN_INSTALL_DIR})
  
 --- /dev/null
-+++ kdebase-workspace-4.4.4/solid/networking/kded/ntracknetworkstate.h
++++ b/solid/networking/kded/ntracknetworkstate.h
 @@ -0,0 +1,51 @@
 +/*
 +    Copyright (c) 2010 Sune Vuorela <sune at debian.org>
@@ -173,8 +176,8 @@ Patch forwarded, hopefully it will soon be applied
 +
 +#endif // HAVE_QNTRACK
 +#endif // NTRACKNETWORKSTATE_H
---- kdebase-workspace-4.4.4.orig/solid/networking/kded/networkstatus.cpp
-+++ kdebase-workspace-4.4.4/solid/networking/kded/networkstatus.cpp
+--- a/solid/networking/kded/networkstatus.cpp
++++ b/solid/networking/kded/networkstatus.cpp
 @@ -32,6 +32,7 @@
  #include "serviceadaptor.h"
  
@@ -202,7 +205,7 @@ Patch forwarded, hopefully it will soon be applied
  #include "networkstatus.moc"
  // vim: set noet sw=4 ts=4:
 --- /dev/null
-+++ kdebase-workspace-4.4.4/cmake/modules/FindQNtrack.cmake
++++ b/cmake/modules/FindQNtrack.cmake
 @@ -0,0 +1,70 @@
 +# - Try to find the QNtrack library
 +# Once done this will define
@@ -274,4 +277,3 @@ Patch forwarded, hopefully it will soon be applied
 +  MARK_AS_ADVANCED(QNTRACK_INCLUDE_DIR QNTRACK_LIBRARIES)
 +
 +endif (QNTRACK_INCLUDE_DIR AND QNTRACK_LIBRARIES)
-

-- 
KDE Base Workspace module packaging