[SCM] KDE Development Platform Libraries module packaging branch, master, updated. debian/4.6.2-1-24-g0b0466c

[Pino Toscano]

The following commit has been merged in the master branch:
commit 0b0466c3be5402a8774b8c5323e2620908617728
Author: Pino Toscano <pino at kde.org>
Date:   Tue May 17 16:32:08 2011 +0200

    backport upstream commit 92db24a to fix double-POST regression in kdelibs 4.6.3
    
    patch upstream_fix_job-on-hold_reuse_logic.diff
---
 debian/changelog                                   |    2 +
 debian/patches/series                              |    1 +
 .../upstream_fix_job-on-hold_reuse_logic.diff      |   33 ++++++++++++++++++++
 3 files changed, 36 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5f87344..094d9a3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,8 @@ kde4libs (4:4.6.3-0r2) UNRELEASED; urgency=low
   [ Pino Toscano ]
   * Move the libxml2-utils dependency from kdelibs-bin to kdoctools (as xmllint
     is invoked by meinproc4).
+  * Backport the upstream commit 92db24adfa941003db1d885df01157056617f30b to fix
+    double-POST regression (patch upstream_fix_job-on-hold_reuse_logic.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sun, 08 May 2011 00:13:20 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index e406468..5d8e749 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -16,3 +16,4 @@ 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
diff --git a/debian/patches/upstream_fix_job-on-hold_reuse_logic.diff b/debian/patches/upstream_fix_job-on-hold_reuse_logic.diff
new file mode 100644
index 0000000..1d75afc
--- /dev/null
+++ b/debian/patches/upstream_fix_job-on-hold_reuse_logic.diff
@@ -0,0 +1,33 @@
+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