[SCM] Akonadi packaging branch, master, updated. debian/16.04.3-2-10-g3475d47

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi.git;a=commitdiff;h=44d20f7

The following commit has been merged in the master branch:
commit 44d20f7d0a51fd0422b4e161a3af7beed315fa16
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Thu Aug 18 20:35:23 2016 +0200

    Refresh patches
---
 debian/patches/postgresql-data-checksums.patch |  4 ++--
 debian/patches/series                          |  1 -
 debian/patches/set_dependency_order.diff       | 20 --------------------
 3 files changed, 2 insertions(+), 23 deletions(-)

diff --git a/debian/patches/postgresql-data-checksums.patch b/debian/patches/postgresql-data-checksums.patch
index 8b9dde4..7d37178 100644
--- a/debian/patches/postgresql-data-checksums.patch
+++ b/debian/patches/postgresql-data-checksums.patch
@@ -7,10 +7,10 @@ Subject: postgresql-data-checksums
  1 file changed, 1 insertion(+)
 
 diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
-index a3ef03e..776b05c 100644
+index 052261c..79c86cc 100644
 --- a/src/server/storage/dbconfigpostgresql.cpp
 +++ b/src/server/storage/dbconfigpostgresql.cpp
-@@ -242,6 +242,7 @@ bool DbConfigPostgresql::startInternalServer()
+@@ -241,6 +241,7 @@ bool DbConfigPostgresql::startInternalServer()
  
          // call 'initdb --pgdata=/home/user/.local/share/akonadi/data_db'
          execute(mInitDbPath, { QStringLiteral("--pgdata=%1").arg(mPgData),
diff --git a/debian/patches/series b/debian/patches/series
index 3357d34..460ddda 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 postgresql-data-checksums.patch
-set_dependency_order.diff
diff --git a/debian/patches/set_dependency_order.diff b/debian/patches/set_dependency_order.diff
deleted file mode 100644
index c5d57c9..0000000
--- a/debian/patches/set_dependency_order.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 15 Jun 2016 08:35:08 +0200
-Subject: set_dependency_order
-
----
- autotests/akonadicontrol/CMakeLists.txt | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/autotests/akonadicontrol/CMakeLists.txt b/autotests/akonadicontrol/CMakeLists.txt
-index dc18aae..4948d49 100644
---- a/autotests/akonadicontrol/CMakeLists.txt
-+++ b/autotests/akonadicontrol/CMakeLists.txt
-@@ -10,6 +10,7 @@ macro(add_unit_test _source)
-     get_filename_component(_name ${_source} NAME_WE)
-     add_executable(${_name} ${_test})
-     add_test(AkonadiControl-${_name} ${_name})
-+    add_dependencies(${_name} akonadi_control)
-     if (ENABLE_ASAN)
-         set_tests_properties(AkonadiControl-${_name} PROPERTIES
-                              ENVIRONMENT ASAN_OPTIONS=symbolize=1

-- 
Akonadi packaging