[SCM] Akonadi packaging branch, master, updated. debian/16.04.1-1-13-g13906e0

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 7b98ecdc8d6331e05a5afa33887033f58954aa7c
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Wed Jun 15 12:51:13 2016 +0200

    Refresh patches
---
 debian/patches/postgresql-data-checksums.patch | 16 ++++++++--------
 debian/patches/postgresql9.4_9.5.patch         | 23 -----------------------
 debian/patches/series                          |  1 -
 3 files changed, 8 insertions(+), 32 deletions(-)

diff --git a/debian/patches/postgresql-data-checksums.patch b/debian/patches/postgresql-data-checksums.patch
index 931a618..8b9dde4 100644
--- a/debian/patches/postgresql-data-checksums.patch
+++ b/debian/patches/postgresql-data-checksums.patch
@@ -7,14 +7,14 @@ Subject: postgresql-data-checksums
  1 file changed, 1 insertion(+)
 
 diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
-index 59a337b..4fe46cf 100644
+index a3ef03e..776b05c 100644
 --- a/src/server/storage/dbconfigpostgresql.cpp
 +++ b/src/server/storage/dbconfigpostgresql.cpp
-@@ -232,6 +232,7 @@ bool DbConfigPostgresql::startInternalServer()
-         QStringList arguments;
-         arguments << QStringLiteral("--pgdata=%2").arg(mPgData)
-                   // TODO check locale
-+                  << QStringLiteral("--data-checksums")
-                   << QStringLiteral("--locale=en_US.UTF-8");
-         QProcess::execute(command, arguments);
+@@ -242,6 +242,7 @@ bool DbConfigPostgresql::startInternalServer()
+ 
+         // call 'initdb --pgdata=/home/user/.local/share/akonadi/data_db'
+         execute(mInitDbPath, { QStringLiteral("--pgdata=%1").arg(mPgData),
++                               QStringLiteral("--data-checksums"),
+                                QStringLiteral("--locale=en_US.UTF-8") // TODO: check locale
+                              });
      }
diff --git a/debian/patches/postgresql9.4_9.5.patch b/debian/patches/postgresql9.4_9.5.patch
deleted file mode 100644
index 63fa3e5..0000000
--- a/debian/patches/postgresql9.4_9.5.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Wed, 13 Apr 2016 11:36:15 +0200
-Subject: postgresql9.4_9.5
-
----
- src/server/storage/dbconfigpostgresql.cpp | 4 +++-
- 1 file changed, 3 insertions(+), 1 deletion(-)
-
-diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
-index 4fe46cf..ee46b9b 100644
---- a/src/server/storage/dbconfigpostgresql.cpp
-+++ b/src/server/storage/dbconfigpostgresql.cpp
-@@ -85,7 +85,9 @@ bool DbConfigPostgresql::init(QSettings &settings)
-                            << QStringLiteral("/usr/lib/postgresql/9.0/bin")
-                            << QStringLiteral("/usr/lib/postgresql/9.1/bin")
-                            << QStringLiteral("/usr/lib/postgresql/9.2/bin")
--                           << QStringLiteral("/usr/lib/postgresql/9.3/bin");
-+                           << QStringLiteral("/usr/lib/postgresql/9.3/bin")
-+                           << QStringLiteral("/usr/lib/postgresql/9.4/bin")
-+                           << QStringLiteral("/usr/lib/postgresql/9.5/bin");
- 
-         defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
-         defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);
diff --git a/debian/patches/series b/debian/patches/series
index f18044e..3357d34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 postgresql-data-checksums.patch
-postgresql9.4_9.5.patch
 set_dependency_order.diff

-- 
Akonadi packaging