[SCM] Akonadi packaging branch, kubuntu_xenial_archive, updated. debian/15.08.0-1-21-g854472a

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 854472abf0191b27011c71d7902a0fb4ad108eda
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Jan 12 00:19:25 2016 +0100

    Adapt postgresql-data-checksums.patch and postgresql9.5.patch to code changes
---
 debian/changelog                               |  2 ++
 debian/patches/postgresql-data-checksums.patch | 14 +++++++-------
 debian/patches/postgresql9.5.patch             | 18 +++++++++---------
 3 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2f350ff..5221015 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ akonadi (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
   * Merge with debian git master
   * Add postgresql 9.5 support to postgresql9.4.patch and rename it to
     postgresql9.5.patch 
+  * Adapt postgresql-data-checksums.patch and postgresql9.5.patch to code
+    changes
 
  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:29:44 +0000
 
diff --git a/debian/patches/postgresql-data-checksums.patch b/debian/patches/postgresql-data-checksums.patch
index 00c7b1e..44598f9 100644
--- a/debian/patches/postgresql-data-checksums.patch
+++ b/debian/patches/postgresql-data-checksums.patch
@@ -4,15 +4,15 @@ 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".
 
-Index: akonadi/src/server/storage/dbconfigpostgresql.cpp
+Index: b/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 @@
+--- a/src/server/storage/dbconfigpostgresql.cpp
++++ b/src/server/storage/dbconfigpostgresql.cpp
+@@ -224,6 +224,7 @@ bool DbConfigPostgresql::startInternalSe
          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.5.patch b/debian/patches/postgresql9.5.patch
index 2dc0eae..269fc01 100644
--- a/debian/patches/postgresql9.5.patch
+++ b/debian/patches/postgresql9.5.patch
@@ -11,13 +11,13 @@ 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,9 @@
-                            << 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")
-+                           << QLatin1String("/usr/lib/postgresql/9.5/bin");
+                            << 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(QLatin1String("pg_ctl"), postgresSearchPath);
-         defaultInitDbPath = XdgBaseDirs::findExecutableFile(QLatin1String("initdb"), postgresSearchPath);
+         defaultServerPath = XdgBaseDirs::findExecutableFile(QStringLiteral("pg_ctl"), postgresSearchPath);
+         defaultInitDbPath = XdgBaseDirs::findExecutableFile(QStringLiteral("initdb"), postgresSearchPath);

-- 
Akonadi packaging