[SCM] kdb packaging branch, master, updated. 48e484703a77ba51976b88d06d1aca0831ef3ae5

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/calligra/kdb.git;a=commitdiff;h=c8aa92a

The following commit has been merged in the master branch:
commit c8aa92a8adfb9041b2556656756605f8f51ba423
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jan 22 14:55:32 2017 +0100

    find PostgreSQL 9.6
    
    backport upstream commit 679178088258119fbf4622d25384e62b5bc8e853
---
 debian/patches/series                              |  1 +
 .../upstream_cmake-find-PostgreSQL-9.6.patch       | 25 ++++++++++++++++++++++
 2 files changed, 26 insertions(+)

diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..439e58a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+upstream_cmake-find-PostgreSQL-9.6.patch
diff --git a/debian/patches/upstream_cmake-find-PostgreSQL-9.6.patch b/debian/patches/upstream_cmake-find-PostgreSQL-9.6.patch
new file mode 100644
index 0000000..4fcd4f8
--- /dev/null
+++ b/debian/patches/upstream_cmake-find-PostgreSQL-9.6.patch
@@ -0,0 +1,25 @@
+From 679178088258119fbf4622d25384e62b5bc8e853 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 8 Oct 2016 16:21:27 +0200
+Subject: [PATCH] cmake: find PostgreSQL 9.6
+
+---
+ cmake/modules/FindPostgreSQL.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindPostgreSQL.cmake b/cmake/modules/FindPostgreSQL.cmake
+index d754eb91..5c50a78f 100644
+--- a/cmake/modules/FindPostgreSQL.cmake
++++ b/cmake/modules/FindPostgreSQL.cmake
+@@ -83,7 +83,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the PostgreSQL_ROOT system variable to wher
+ 
+ 
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+-    "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++    "9.6" "9.5" "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
+ 
+ # Define additional search paths for root directories.
+ foreach (suffix ${PostgreSQL_KNOWN_VERSIONS} )
+-- 
+2.11.0
+

-- 
kdb packaging