[SCM] KDE PIM Libraries module packaging branch, master, updated. debian/4.8.4-1-5-g708254b

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 708254b1f00e8b44525869ec51fc990e08373a85
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Sep 29 17:01:43 2012 -0300

    Remove crash_when_marking_folder_read.diff.
    
    Already applied upstream.
---
 debian/changelog                                   |    1 +
 debian/patches/crash_when_marking_folder_read.diff |   36 --------------------
 debian/patches/series                              |    1 -
 3 files changed, 1 insertions(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6bcbd0..5596e7f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kdepimlibs (4:4.8.5-0r0) UNRELEASED; urgency=low
   * New upstream release.
   * Add myself to Uploaders.
   * Confirm symbols files with 4:4.8.4's build logs.
+  * Remove crash_when_marking_folder_read.diff, already applied upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 29 Sep 2012 16:51:09 -0300
 
diff --git a/debian/patches/crash_when_marking_folder_read.diff b/debian/patches/crash_when_marking_folder_read.diff
deleted file mode 100644
index f25806c..0000000
--- a/debian/patches/crash_when_marking_folder_read.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-From e537fb9bdbd9bbbc612d5521d974d64efbcda0a9 Mon Sep 17 00:00:00 2001
-From: Montel Laurent <montel at kde.org>
-Date: Wed, 6 Jun 2012 20:40:30 +0200
-Subject: [PATCH] Try to fix Bug 283272 - crash when marking folder read
-
-I don't know how status can be empty.
-But I fix as it. It will fix crash.
-If somebody which has this crash perhaps it can apply this patch and
-verify if it fixes bug.
-
-FIXED-IN: 4.8.5
-BUG: 283272
-(cherry picked from commit 67cfe2290a8c1817a92c6da65da001d267a0f24f)
----
- akonadi/kmime/markascommand.cpp |    5 ++++-
- 1 file changed, 4 insertions(+), 1 deletion(-)
-
-diff --git a/akonadi/kmime/markascommand.cpp b/akonadi/kmime/markascommand.cpp
-index 96281d5..e8c5974 100644
---- a/akonadi/kmime/markascommand.cpp
-+++ b/akonadi/kmime/markascommand.cpp
-@@ -104,7 +104,10 @@ void MarkAsCommand::markMessages()
- 
-   QSet<QByteArray> flags = mTargetStatus.statusFlags();
-   Q_ASSERT( flags.size() == 1 );
--  const Akonadi::Item::Flag flag = *(flags.begin());
-+  Akonadi::Item::Flag flag;
-+  if(!flags.isEmpty()) 
-+    flag = *(flags.begin());
-+
-   Akonadi::Item::List itemsToModify;
-   foreach( const Akonadi::Item &it, mMessages ) {
-     Akonadi::Item item( it );
--- 
-1.7.10
-
diff --git a/debian/patches/series b/debian/patches/series
index dde0990..333e353 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-crash_when_marking_folder_read.diff
 03_hide_akonadi_progressbar.diff

-- 
KDE PIM Libraries module packaging