[SCM] KDE Development Platform Libraries module packaging branch, kde4.8, updated. debian/4.7.4-4-15-g89bc2be

[Eshat Cakar]

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

The following commit has been merged in the kde4.8 branch:
commit 10abf5390614c805d364861e52b573856f35cc73
Author: Eshat Cakar <info at eshat.de>
Date:   Wed Apr 4 18:24:42 2012 +0200

    remove upstream_better-check-for-return-values-of-m_protocols.value.patch, applied upstream
---
 debian/changelog                                   |    4 ++-
 debian/patches/series                              |    1 -
 ...ck-for-return-values-of-m_protocols.value.patch |   30 --------------------
 3 files changed, 3 insertions(+), 32 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 351e34f..c6a1d8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-kde4libs (4:4.8.1-0r1) UNRELEASED; urgency=low
+kde4libs (4:4.8.2-0r0) UNRELEASED; urgency=low
 
   * New upstream release.
 
@@ -6,6 +6,8 @@ kde4libs (4:4.8.1-0r1) UNRELEASED; urgency=low
   * Add myself to uploaders.
   * Update installed files.
   * Update not-installed files.
+  * Remove upstream_better-check-for-return-values-of-m_protocols.value.patch
+    (applied upstream).
 
   [ José Manuel Santamaría Lema ]
   * Update symbols files.
diff --git a/debian/patches/series b/debian/patches/series
index eed5b71..0395be1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,4 +21,3 @@ findpythonlibrary_layout_deb_on_debian.diff
 ktar_header_checksum_fix.diff
 ktar_longlink_length_in_bytes.diff
 glibc_filesystem.diff
-upstream_better-check-for-return-values-of-m_protocols.value.patch
diff --git a/debian/patches/upstream_better-check-for-return-values-of-m_protocols.value.patch b/debian/patches/upstream_better-check-for-return-values-of-m_protocols.value.patch
deleted file mode 100644
index 3e64259..0000000
--- a/debian/patches/upstream_better-check-for-return-values-of-m_protocols.value.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From d1edc0f038818a073488f6a1822cfb01d43d67e4 Mon Sep 17 00:00:00 2001
-From: Pino Toscano <pino at kde.org>
-Date: Fri, 9 Mar 2012 16:16:45 +0100
-Subject: [PATCH] better check for return values of m_protocols.value(...)
-
-This is a better fix for such situation in SchedulerPrivate::assignJobToSlave(), as a followup of
-777f69880989d87adfe3011cf0b8db93f70a626c
-
-BUG: 282889
-FIXED-IN: 4.8.2
----
- kio/kio/scheduler.cpp |    7 +++++--
- 1 files changed, 5 insertions(+), 2 deletions(-)
-
---- a/kio/kio/scheduler.cpp
-+++ b/kio/kio/scheduler.cpp
-@@ -1271,8 +1271,11 @@ bool SchedulerPrivate::assignJobToSlave(
-     kDebug(7006) << slave << job;
-     // KDE5: queueing of jobs can probably be removed, it provides very little benefit
-     ProtoQueue *pq = m_protocols.value(slave->protocol());
--    pq->removeJob(job);
--    return (pq ? pq->m_connectedSlaveQueue.queueJob(job, slave) : false);
-+    if (pq) {
-+        pq->removeJob(job);
-+        return pq->m_connectedSlaveQueue.queueJob(job, slave);
-+    }
-+    return false;
- }
- 
- bool SchedulerPrivate::disconnectSlave(KIO::Slave *slave)

-- 
KDE Development Platform Libraries module packaging