[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.6.2-2-4-g469384f

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit 17809c22bc598ba091e3a9a58ca70a4b351e7046
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Wed May 4 16:51:57 2011 +0200

    Remove fix_temperature_sensors.diff, fix changelog.
---
 debian/changelog                            |    2 ++
 debian/patches/fix_temperature_sensors.diff |   22 ----------------------
 debian/patches/series                       |    1 -
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f4c5721..f201bca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kdebase-workspace (4:4.6.3-0r0) UNRELEASED; urgency=low
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.6.2.
+  * Remove fix_temperature_sensors.diff, applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 02 May 2011 22:16:17 +0200
 
@@ -103,6 +104,7 @@ kdebase-workspace (4:4.6.2-1) experimental; urgency=low
     - initialize_variables_crashfix.diff
   * New patches:
     - initialize_variables_crashfix.diff
+    - fix_temperature_sensors.diff
   * Rename libweather-ion4a as libweather-ion6 due to soname bump.
   * Remove plasma-scriptengine-qedje package.
   * Bump kde-sc-dev-latest build dependency to 4:4.6.2.
diff --git a/debian/patches/fix_temperature_sensors.diff b/debian/patches/fix_temperature_sensors.diff
deleted file mode 100644
index 80a530f..0000000
--- a/debian/patches/fix_temperature_sensors.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-commit 0e151ea2ab1663f3649688139739712060ae3259
-Author: John Tapsell <johnflux at gmail.com>
-Date:   Thu Apr 7 10:59:20 2011 +0100
-
-    Fix accidental removal of a #include, when adding freebsd support.  This broke the lmsensors at minimum
-    
-    BUG: 270246
-    BUG: 270246
-    CCMAIL: naylor.b.david at gmail.com
-
-diff --git a/ksysguard/ksysguardd/modules.h b/ksysguard/ksysguardd/modules.h
-index e780be6..9aae890 100644
---- a/ksysguard/ksysguardd/modules.h
-+++ b/ksysguard/ksysguardd/modules.h
-@@ -23,6 +23,7 @@
- #ifndef KSG_MODULES_H
- #define KSG_MODULES_H
- 
-+#include "config-ksysguardd.h"
- #include "Command.h"
- #include "conf.h"
- #include "ksysguardd.h"
diff --git a/debian/patches/series b/debian/patches/series
index abd7084..5ffad7e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,4 +15,3 @@ qguiplatformplugin_kde_NULL_check.diff
 fix_target_link_libraries.diff
 enable_debianabimanager.diff
 initialize_variables_crashfix.diff
-fix_temperature_sensors.diff

-- 
KDE Base Workspace module packaging