[SCM] KDE PIM module packaging branch, master, updated. debian/4.10.5-1

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 78ba1eae800a8e5db498e52a990eaf6a1054aa04
Author: Modestas Vainius <modax at debian.org>
Date:   Sun Jun 10 18:12:55 2012 +0300

    Drop upstream_Fix-crash-in-Folder-destructor.patch, merged upstream.
---
 debian/changelog                                   |    1 +
 debian/patches/series                              |    1 -
 .../upstream_Fix-crash-in-Folder-destructor.patch  |   36 --------------------
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8a81741..582aa69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -44,6 +44,7 @@ kdepim (4:4.8.4-0r0) UNRELEASED; urgency=low
   * Drop upstream_Bug-271580-Fix-crash-displaying-New-Alarm-dialog-fro.patch,
     merged upstream.
   * Drop upstream_Build-with-clang.patch, merged upstream.
+  * Drop upstream_Fix-crash-in-Folder-destructor.patch, merged upstream.
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.8.4.
diff --git a/debian/patches/series b/debian/patches/series
index 59cc76c..c3616a4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 debianize_akregator_default.diff
-upstream_Fix-crash-in-Folder-destructor.patch
 upstream_in-c4_String-c4_String-only-call-memset-if-the-numbe.patch
diff --git a/debian/patches/upstream_Fix-crash-in-Folder-destructor.patch b/debian/patches/upstream_Fix-crash-in-Folder-destructor.patch
deleted file mode 100644
index 5038eb1..0000000
--- a/debian/patches/upstream_Fix-crash-in-Folder-destructor.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From 6ae89eee936159dd7d7ca3405fbe6d9d66d86ddd Mon Sep 17 00:00:00 2001
-From: Christoph Feck <christoph at maxiom.de>
-Date: Mon, 7 Nov 2011 21:29:38 +0100
-Subject: [PATCH] Fix crash in Folder destructor
-
-Especially visible with Qt 4.8.0 qDeleteAll() changes, but might also
-fix older bugs.
-
-BUG: 285938
-CCBUG: 193780
-FIXED-IN: 4.7.4
-REVIEW: 102981
-(cherry picked from commit 3497e5afe51490191825c7b7d475a5fc0702988d)
----
- akregator/src/folder.cpp |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/akregator/src/folder.cpp b/akregator/src/folder.cpp
-index f2385b0..249e598 100644
---- a/akregator/src/folder.cpp
-+++ b/akregator/src/folder.cpp
-@@ -65,7 +65,10 @@ Folder::FolderPrivate::FolderPrivate( Folder* qq ) : q( qq ), unread( 0 ), open(
- 
- Folder::FolderPrivate::~FolderPrivate()
- {
--    qDeleteAll( children );
-+    while (!children.isEmpty()) {
-+        // child removes itself from list in its destructor
-+        delete children.first();
-+    }
-     emit q->emitSignalDestroyed();
- }
- 
--- 
-1.7.10
-

-- 
KDE PIM module packaging