[SCM] KDE Base Workspace module packaging branch, kde4.8, updated. debian/4.8.3-2-17-gcb42096

[José Manuel Santamaría Lema]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-sc/kdebase-workspace.git;a=commitdiff;h=ccf00b7

The following commit has been merged in the kde4.8 branch:
commit ccf00b70b955d9e1a4b13b091a07dc6107f0040c
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Jun 8 04:37:11 2012 +0200

    Add new_beams_custom_plots.diff.
---
 debian/changelog                           |    1 +
 debian/patches/new_beams_custom_plots.diff |   35 ++++++++++++++++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 37 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ef73fd1..9b9c41c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kde-workspace (4:4.8.4-0r1) UNRELEASED; urgency=low
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.8.4.
   * Add process_table_unclickable.diff. 
+  * Add new_beams_custom_plots.diff.
   * Refresh patches to make them apply without any offset.
   * Confirm symbols files on more architectures with the 4.8.3 build logs.
   * Set plasma-scriptengine-googlegadgets priority to 'optional'. This fixes the
diff --git a/debian/patches/new_beams_custom_plots.diff b/debian/patches/new_beams_custom_plots.diff
new file mode 100644
index 0000000..a783927
--- /dev/null
+++ b/debian/patches/new_beams_custom_plots.diff
@@ -0,0 +1,35 @@
+From 4ccec1a6623426ad7b3672ce85424ad9201e5b73 Mon Sep 17 00:00:00 2001
+From: John Tapsell <johnflux at gmail.com>
+Date: Wed, 6 Jun 2012 23:00:36 +0100
+Subject: [PATCH] Fix regression that you couldn't add new beams to custom
+ plots
+
+Thanks to Simon Kaczor for the patch
+BUG: 290504
+---
+ ksysguard/gui/WorkSheet.cpp |    6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/ksysguard/gui/WorkSheet.cpp b/ksysguard/gui/WorkSheet.cpp
+index a50019a..b20f077 100644
+--- a/ksysguard/gui/WorkSheet.cpp
++++ b/ksysguard/gui/WorkSheet.cpp
+@@ -407,13 +407,11 @@ KSGRD::SensorDisplay *WorkSheet::addDisplay( const QString &hostName,
+             return 0;
+         }
+         display = insertDisplay(displayType, sensorDescr, index);
+-	if (!display->addSensor( hostName, sensorName, sensorType, sensorDescr )) {
++    }
++    if (!display->addSensor( hostName, sensorName, sensorType, sensorDescr )) {
+             // Failed to add sensor, so we need to remove the display that we just added
+             removeDisplay(display);
+             return 0;
+-	}
+-
+-
+     }
+ 
+     return display;
+-- 
+1.7.10
+
diff --git a/debian/patches/series b/debian/patches/series
index 7d380a5..14c5ca4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -18,3 +18,4 @@ enable_dlrestrcitions.diff
 kdm_vt_switching_on_kfreebsd.diff
 nlist_ftbfs_krefreebsd.diff
 process_table_unclickable.diff
+new_beams_custom_plots.diff

-- 
KDE Base Workspace module packaging