[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.6.3-3-7-g3f5593f

[José Manuel Santamaría Lema]

The following commit has been merged in the master branch:
commit b247c3f45a7c7092724bc4b813ceaab89f04cd49
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Thu Jun 9 20:05:53 2011 +0200

    Remove upstream_fix_job-on-hold_reuse_logic.diff
---
 debian/changelog                                   |    3 ++
 debian/patches/series                              |    1 -
 .../upstream_fix_job-on-hold_reuse_logic.diff      |   33 --------------------
 3 files changed, 3 insertions(+), 34 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1daaa8e..b332220 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,9 @@ kde4libs (4:4.6.4-0r0) UNRELEASED; urgency=low
   * FindPythonLibrary.cmake: if build type is Debian, pass --layout=deb to
     FindLibPython.py.
 
+  [ José Manuel Santamaría Lema ]
+  * Remove upstream_fix_job-on-hold_reuse_logic.diff, applied upstream.
+
  -- José Manuel Santamaría Lema <panfaust at gmail.com>  Thu, 09 Jun 2011 16:58:29 +0000
 
 kde4libs (4:4.6.3-3) unstable; urgency=low
diff --git a/debian/patches/series b/debian/patches/series
index b0c471c..33032c6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,6 +16,5 @@ konsole_kfreebsd_fix.diff
 hurd_support.diff
 kfileshare_kdesu_fileshareset.diff
 relax_plugin_kde_version_check.diff
-upstream_fix_job-on-hold_reuse_logic.diff
 add_dlrestrictions_support.diff
 findpythonlibrary_layout_deb_on_debian.diff
diff --git a/debian/patches/upstream_fix_job-on-hold_reuse_logic.diff b/debian/patches/upstream_fix_job-on-hold_reuse_logic.diff
deleted file mode 100644
index 1d75afc..0000000
--- a/debian/patches/upstream_fix_job-on-hold_reuse_logic.diff
+++ /dev/null
@@ -1,33 +0,0 @@
-From 92db24adfa941003db1d885df01157056617f30b Mon Sep 17 00:00:00 2001
-From: Maks Orlovich <maksim at kde.org>
-Date: Sun, 8 May 2011 14:39:03 -0400
-Subject: [PATCH] Fix the job-on-hold reuse logic, which caused the
- double-POST problem)
-
-adawit, could you please at least READ what you're backporting if you are
-going to be this aggressive? Or better yet, please don't backport anything
-that's not fixing a critical bug or is trivial, as per:
-http://techbase.kde.org/Policies/Minor_Point_Release_Policy
-
-CCMAIL: adawit at kde.org
-BUG: 272466
----
- kio/kio/scheduler.cpp |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/kio/kio/scheduler.cpp b/kio/kio/scheduler.cpp
-index 55da053..9f5607e 100644
---- a/kio/kio/scheduler.cpp
-+++ b/kio/kio/scheduler.cpp
-@@ -1151,7 +1151,7 @@ Slave *SchedulerPrivate::heldSlaveForJob(SimpleJob *job)
-         bool canJobReuse = (cmd == CMD_GET || cmd == CMD_MULTI_GET);
- 
-         if (KIO::TransferJob *tJob = qobject_cast<KIO::TransferJob *>(job)) {
--            canJobReuse = cmd == (canJobReuse || cmd == CMD_SPECIAL);
-+            canJobReuse = (canJobReuse || cmd == CMD_SPECIAL);
-             if (canJobReuse) {
-                 KIO::MetaData outgoing = tJob->outgoingMetaData();
-                 const QString resume = outgoing.value("resume");
--- 
-1.7.4.4
-

-- 
KDE Development Platform Libraries module packaging