[SCM] Akonadi packaging branch, master, updated. debian/1.11.0-1

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-req/akonadi.git;a=commitdiff;h=9cbe0e3

The following commit has been merged in the master branch:
commit 9cbe0e301f0c84ac71905f83d79106fd4447e9e7
Author: Maximiliano Curia <maxy at debian.org>
Date:   Wed Jan 8 15:38:43 2014 -0300

    New upstream patch: correctly_detect_inter-resource_moves.diff.
---
 debian/changelog                                   |  1 +
 .../correctly_detect_inter-resource_moves.diff     | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 9b7f55e..3bb65db 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ akonadi (1.11.0-1) UNRELEASED; urgency=low
   * New upstream patch: always_verify_writing_data_to_external_file.diff
   * Update symbols file.
   * Update install files.
+  * New upstream patch: correctly_detect_inter-resource_moves.diff.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 06 Dec 2013 16:24:12 +0100
 
diff --git a/debian/patches/correctly_detect_inter-resource_moves.diff b/debian/patches/correctly_detect_inter-resource_moves.diff
new file mode 100644
index 0000000..f0bbf59
--- /dev/null
+++ b/debian/patches/correctly_detect_inter-resource_moves.diff
@@ -0,0 +1,26 @@
+commit 980b02ff4b0ba7e49f3b32d39ecd76121456c3f6
+Author: Dan Vrátil <dvratil at redhat.com>
+Date:   Thu Dec 12 16:13:41 2013 +0100
+
+    Correctly detect inter-resource moves
+    
+    When comparing the source and destination resources, the item
+    already has the destination collection and resource  set, so
+    we need to compare it with the source resource
+    
+    BUG: 328298
+    FIXED-IN: 1.11.1
+
+diff --git a/server/src/handler/move.cpp b/server/src/handler/move.cpp
+index b5b20f4..8bea8f8 100644
+--- a/server/src/handler/move.cpp
++++ b/server/src/handler/move.cpp
+@@ -106,7 +106,7 @@ bool Move::parseStream()
+       Q_FOREACH ( PimItem moved, toMove.values( sourceId ) ) {
+         // reset RID on inter-resource moves, but only after generating the change notification
+         // so that this still contains the old one for the source resource
+-        const bool isInterResourceMove = moved.collection().resource().id() != destResource.id();
++        const bool isInterResourceMove = moved.collection().resource().id() != source.resource().id();
+         if ( isInterResourceMove ) {
+           moved.setRemoteId( QString() );
+         }
diff --git a/debian/patches/series b/debian/patches/series
index 64c8dfd..809addd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 dont_do_redundant_flag_changes.diff
 always_verify_writing_data_to_external_file.diff
+correctly_detect_inter-resource_moves.diff

-- 
Akonadi packaging