[SCM] Akonadi packaging branch, master, updated. debian/15.08.3-1-4-g4659126

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 35462d9ac9ac829be7a4aec257146d97b74cf9c1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 27 13:54:25 2016 +0100

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

diff --git a/debian/patches/postgresql-data-checksums.patch b/debian/patches/postgresql-data-checksums.patch
index 00c7b1e..b42f90b 100644
--- a/debian/patches/postgresql-data-checksums.patch
+++ b/debian/patches/postgresql-data-checksums.patch
@@ -6,13 +6,13 @@ Description: initialise PSQL database with "--data-checksums".
 
 Index: akonadi/src/server/storage/dbconfigpostgresql.cpp
 ===================================================================
---- akonadi.orig/src/server/storage/dbconfigpostgresql.cpp	2015-09-05 12:40:50.673166408 +0200
-+++ akonadi/src/server/storage/dbconfigpostgresql.cpp	2015-09-05 12:43:05.975761742 +0200
-@@ -223,6 +223,7 @@
+--- 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 @@
          QStringList arguments;
-         arguments << QString::fromLatin1("--pgdata=%2").arg(mPgData)
+         arguments << QStringLiteral("--pgdata=%2").arg(mPgData)
                    // TODO check locale
-+                  << QString::fromLatin1( "--data-checksums")
-                   << QString::fromLatin1("--locale=en_US.UTF-8");
++                  << QStringLiteral("--data-checksums")
+                   << QStringLiteral("--locale=en_US.UTF-8");
          QProcess::execute(command, arguments);
      }
diff --git a/debian/patches/postgresql9.4.patch b/debian/patches/postgresql9.4.patch
deleted file mode 100644
index cd7a915..0000000
--- a/debian/patches/postgresql9.4.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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...
-
-Index: akonadi/src/server/storage/dbconfigpostgresql.cpp
-===================================================================
---- akonadi.orig/src/server/storage/dbconfigpostgresql.cpp	2015-09-05 12:43:05.975761742 +0200
-+++ akonadi/src/server/storage/dbconfigpostgresql.cpp	2015-09-05 12:45:06.906930014 +0200
-@@ -84,7 +84,8 @@
-                            << QLatin1String("/usr/lib/postgresql/9.0/bin")
-                            << QLatin1String("/usr/lib/postgresql/9.1/bin")
-                            << QLatin1String("/usr/lib/postgresql/9.2/bin")
--                           << QLatin1String("/usr/lib/postgresql/9.3/bin");
-+                           << QLatin1String("/usr/lib/postgresql/9.3/bin")
-+                           << QLatin1String("/usr/lib/postgresql/9.4/bin");
- 
-         defaultServerPath = XdgBaseDirs::findExecutableFile(QLatin1String("pg_ctl"), postgresSearchPath);
-         defaultInitDbPath = XdgBaseDirs::findExecutableFile(QLatin1String("initdb"), postgresSearchPath);
diff --git a/debian/patches/postgresql9.4_9.5.patch b/debian/patches/postgresql9.4_9.5.patch
new file mode 100644
index 0000000..90b5335
--- /dev/null
+++ b/debian/patches/postgresql9.4_9.5.patch
@@ -0,0 +1,23 @@
+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...
+
+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 @@
+                            << 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 c599d61..0d3df07 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 postgresql-data-checksums.patch
-postgresql9.4.patch
+postgresql9.4_9.5.patch

-- 
Akonadi packaging