[SCM] KDE Base Workspace module packaging branch, master, updated. debian/4.8.4-3-6-gdb75bdc

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit db75bdcc8ecc5e19a29fe88e0cc2777078c67e6f
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Sep 30 17:38:43 2012 -0300

    Remove new_beams_custom_plots.diff.
    
    Already applied upstream.
---
 debian/changelog                           |    4 ++-
 debian/patches/new_beams_custom_plots.diff |   35 ----------------------------
 debian/patches/series                      |    1 -
 3 files changed, 3 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 68b7f1e..8e4c1f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,7 +8,9 @@ kde-workspace (4:4.8.5-0r0) UNRELEASED; urgency=low
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Confirm symbols from buildds' logs.
-  * Remove process_table_unclickable.diff. Already present upstream.
+  * Remove patches already applied upstream.
+    - process_table_unclickable.diff.
+    - new_beams_custom_plots.diff.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 15 Aug 2012 11:34:25 +0200
 
diff --git a/debian/patches/new_beams_custom_plots.diff b/debian/patches/new_beams_custom_plots.diff
deleted file mode 100644
index a783927..0000000
--- a/debian/patches/new_beams_custom_plots.diff
+++ /dev/null
@@ -1,35 +0,0 @@
-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 c8cdb20..f0acc0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -17,7 +17,6 @@ initialize_variables_crashfix.diff
 enable_dlrestrcitions.diff
 kdm_vt_switching_on_kfreebsd.diff
 nlist_ftbfs_krefreebsd.diff
-new_beams_custom_plots.diff
 relax_kdelibs_dependency.diff
 hurd.diff
 upstream_make-sure-scripts-are-executed-sorted.patch

-- 
KDE Base Workspace module packaging