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

[Kubuntu CI (Harald Sitter)]

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

The following commit has been merged in the kubuntu_stable branch:
commit 0cd30f1bb2b68b95e3058226807b3c5ff7fd2b3d
Author: Philip Muškovac <yofel at gmx.net>
Date:   Tue Jan 12 00:07:19 2016 +0100

    Add postgresl 9.5 support
---
 debian/changelog                                            | 2 ++
 debian/patches/{postgresql9.4.patch => postgresql9.5.patch} | 9 +++++----
 debian/patches/series                                       | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e35b98c..2f350ff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ akonadi (4:15.12.0-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Philip Muškovac ]
   * Merge with debian git master
+  * Add postgresql 9.5 support to postgresql9.4.patch and rename it to
+    postgresql9.5.patch 
 
  -- Clive Johnston <clivejo at aol.com>  Sat, 02 Jan 2016 13:29:44 +0000
 
diff --git a/debian/patches/postgresql9.4.patch b/debian/patches/postgresql9.5.patch
similarity index 87%
rename from debian/patches/postgresql9.4.patch
rename to debian/patches/postgresql9.5.patch
index cd7a915..2dc0eae 100644
--- a/debian/patches/postgresql9.4.patch
+++ b/debian/patches/postgresql9.5.patch
@@ -1,8 +1,8 @@
-Last-Update: 2015-07-14
+Last-Update: 2016-01-11
 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
+Description: add PostgreSQL 9.5 path
  Perhaps there shall be a better way to find PostgreSQL executable than
  to search through the list of hard-coded paths...
 
@@ -10,13 +10,14 @@ 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 @@
+@@ -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.4/bin")
++                           << QLatin1String("/usr/lib/postgresql/9.5/bin");
  
          defaultServerPath = XdgBaseDirs::findExecutableFile(QLatin1String("pg_ctl"), postgresSearchPath);
          defaultInitDbPath = XdgBaseDirs::findExecutableFile(QLatin1String("initdb"), postgresSearchPath);
diff --git a/debian/patches/series b/debian/patches/series
index c599d61..f52e7e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
 postgresql-data-checksums.patch
-postgresql9.4.patch
+postgresql9.5.patch

-- 
Akonadi packaging