[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.4.5-9-138-gad73eb6

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Tue Apr 26 01:51:18 UTC 2011


The following commit has been merged in the master branch:
commit ad73eb68dfa5dca570b25197f699c88ebe994172
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Tue Apr 26 01:54:17 2011 +0200

    Add initialize_variables_crashfix.diff
---
 debian/changelog                            |    2 ++
 debian/patches/fix_temperature_sensors.diff |   22 ++++++++++++++++++++++
 debian/patches/series                       |    1 +
 3 files changed, 25 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 82a237d..d858d3a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -80,6 +80,8 @@ kdebase-workspace (4:4.6.2-0r2) UNRELEASED; urgency=low
   * Refreshed/reworked patches:
     - 30_plasma_netbook_fix_autostart.diff
     - initialize_variables_crashfix.diff
+  * New patches:
+    - initialize_variables_crashfix.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
new file mode 100644
index 0000000..80a530f
--- /dev/null
+++ b/debian/patches/fix_temperature_sensors.diff
@@ -0,0 +1,22 @@
+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 5ffad7e..abd7084 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -15,3 +15,4 @@ 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



More information about the pkg-kde-commits mailing list