[SCM] Akonadi packaging branch, master, updated. debian/1.13.0-3-7-gddc92e7

[Dmitry Smirnov]

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

The following commit has been merged in the master branch:
commit 2cc00d28862a8c49e079b264e26f27e2dba1611f
Author: Dmitry Smirnov <onlyjob at member.fsf.org>
Date:   Tue Jul 14 02:18:24 2015 +1000

    New patch to add PostgreSQL 9.4 search path (Closes: #791805).
---
 debian/patches/postgresql9.4.patch | 22 ++++++++++++++++++++++
 debian/patches/series              |  1 +
 2 files changed, 23 insertions(+)

diff --git a/debian/patches/postgresql9.4.patch b/debian/patches/postgresql9.4.patch
new file mode 100644
index 0000000..6f96b76
--- /dev/null
+++ b/debian/patches/postgresql9.4.patch
@@ -0,0 +1,22 @@
+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...
+
+--- a/server/src/storage/dbconfigpostgresql.cpp
++++ b/server/src/storage/dbconfigpostgresql.cpp
+@@ -78,9 +78,10 @@
+                        << QLatin1String( "/usr/lib/postgresql/8.4/bin" )
+                        << 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 );
+     defaultHostName = Utils::preferredSocketDirectory( AkStandardDirs::saveDir( "data", QLatin1String( "db_misc" ) ) );
diff --git a/debian/patches/series b/debian/patches/series
index c53bc9f..9a06d5d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+postgresql9.4.patch
 upstream-fix_typo_in_if_condition.patch
 upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN.patch
 upstream-do_not_crash_when_setmntent_returns_NULL.patch

-- 
Akonadi packaging