[SCM] Akonadi packaging branch, master, updated. debian/15.12.1-1-27-g6865f8c

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 16cb0b9e45834a1d51203560d0663a6c50d4fff5
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Wed Apr 13 11:36:21 2016 +0200

    Refresh patches
---
 debian/patches/postgresql-data-checksums.patch | 22 ++++++++++++----------
 debian/patches/postgresql9.4_9.5.patch         | 24 ++++++++++++------------
 2 files changed, 24 insertions(+), 22 deletions(-)

diff --git a/debian/patches/postgresql-data-checksums.patch b/debian/patches/postgresql-data-checksums.patch
index b42f90b..931a618 100644
--- a/debian/patches/postgresql-data-checksums.patch
+++ b/debian/patches/postgresql-data-checksums.patch
@@ -1,14 +1,16 @@
-Last-Update: 2015-07-14
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791807
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: initialise PSQL database with "--data-checksums".
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Wed, 13 Apr 2016 11:36:15 +0200
+Subject: postgresql-data-checksums
 
-Index: akonadi/src/server/storage/dbconfigpostgresql.cpp
-===================================================================
---- akonadi.orig/src/server/storage/dbconfigpostgresql.cpp	2016-01-27 13:48:55.206936407 +0100
-+++ akonadi/src/server/storage/dbconfigpostgresql.cpp	2016-01-27 13:51:15.281343111 +0100
-@@ -224,6 +224,7 @@
+---
+ src/server/storage/dbconfigpostgresql.cpp | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/server/storage/dbconfigpostgresql.cpp b/src/server/storage/dbconfigpostgresql.cpp
+index 59a337b..4fe46cf 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
diff --git a/debian/patches/postgresql9.4_9.5.patch b/debian/patches/postgresql9.4_9.5.patch
index 90b5335..63fa3e5 100644
--- a/debian/patches/postgresql9.4_9.5.patch
+++ b/debian/patches/postgresql9.4_9.5.patch
@@ -1,16 +1,16 @@
-Last-Update: 2015-07-14
-Forwarded: no
-Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=791805
-Author: Dmitry Smirnov <onlyjob at member.fsf.org>
-Description: add PostgreSQL 9.4 path
- Perhaps there shall be a better way to find PostgreSQL executable than
- to search through the list of hard-coded paths...
+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
 
-Index: akonadi/src/server/storage/dbconfigpostgresql.cpp
-===================================================================
---- akonadi.orig/src/server/storage/dbconfigpostgresql.cpp	2016-01-27 13:51:28.796803319 +0100
-+++ akonadi/src/server/storage/dbconfigpostgresql.cpp	2016-01-27 13:53:00.233150969 +0100
-@@ -84,7 +84,9 @@
+---
+ 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")

-- 
Akonadi packaging