[SCM] KDE PIM Libraries module packaging branch, kde4.10, updated. debian/4.10.4-1-8-gf6e6547

[Maximiliano Curia]

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

The following commit has been merged in the kde4.10 branch:
commit f6e65470db5bef4022fc2b5e537457dac7cb6dda
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Jul 1 11:09:26 2013 +0200

    Remove upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff, already applied upstream.
---
 debian/changelog                                   |    3 +-
 debian/patches/series                              |    1 -
 ...m_b92782580756b3858f0381a5200b79688ab0b0a2.diff |   29 --------------------
 3 files changed, 2 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d966bcd..378f27f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 kdepimlibs (4:4.10.4-2) UNRELEASED; urgency=low
 
-  * 
+  * Remove upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff, already
+    applied upstream.
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 01 Jul 2013 11:06:14 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index bda4e29..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff
diff --git a/debian/patches/upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff b/debian/patches/upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff
deleted file mode 100644
index dcd32ee..0000000
--- a/debian/patches/upstream_b92782580756b3858f0381a5200b79688ab0b0a2.diff
+++ /dev/null
@@ -1,29 +0,0 @@
-Author: Volker Krause <vkrause at kde.org>
-Author: David Faure <faure at kde.org>
-Description: Don't keep reading when we reached the end of the stream.
- .
- This should prevent corrupt change replay files from eating up all your
- memory.
-Applied-Upstream: 4.9.3, commit:f142cc25b5620c2d1037cc6cd270b1cf301b5380
-Bug: https://bugs.kde.org/show_bug.cgi?id=298257
-
---- a/akonadi/changerecorder_p.h
-+++ b/akonadi/changerecorder_p.h
-@@ -138,7 +138,7 @@ class AKONADI_TESTS_EXPORT Akonadi::Chan
-       QQueue<NotificationMessage> list;
- 
-       stream >> size;
--      for ( qulonglong i = 0; i < size; ++i ) {
-+      for ( qulonglong i = 0; i < size && !stream.atEnd(); ++i ) {
-         NotificationMessage msg;
- 
-         stream >> sessionId;
-@@ -186,7 +186,7 @@ class AKONADI_TESTS_EXPORT Akonadi::Chan
-         QStringList list;
- 
-         stream >> size;
--        for ( qulonglong i = 0; i < size; ++i ) {
-+        for ( qulonglong i = 0; i < size && !stream.atEnd(); ++i ) {
-           stream >> sessionId;
-           stream >> type;
-           stream >> operation;

-- 
KDE PIM Libraries module packaging