[SCM] Calligra suite packaging branch, master, updated. debian/2.9.11+dfsg-2-3-ge23b36e

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit e23b36e7bab56f207e362feb05386d8a8f3e9bf2
Author: Pino Toscano <pino at debian.org>
Date:   Mon Oct 10 19:49:05 2016 +0200

    find PostgreSQL 9.6 (#840071)
    
    backport upstream commit 843c41decfa85e351349f7a410893ac85c9d60b7
---
 debian/changelog                                   |  3 +++
 debian/patches/series                              |  1 +
 .../upstream_cmake-find-PostgreSQL-9.6.patch       | 25 ++++++++++++++++++++++
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f7ad9a8..9023904 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ calligra (1:2.9.11+dfsg-3) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * Update Vcs-* fields.
+  * Backport upstream commit 843c41decfa85e351349f7a410893ac85c9d60b7 to find
+    PostgreSQL 9.6; patch upstream_cmake-find-PostgreSQL-9.6.patch.
+    (Closes: #840071)
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 17 Sep 2016 19:07:44 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
index 33d7b48..8d2401b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 upstream_fix-arm-FTBFS.patch
 upstream_Fix-compilation-of-PsCommentLexer.cpp-on-platforms-w.patch
+upstream_cmake-find-PostgreSQL-9.6.patch
 add_keywords_to_desktop_files.patch
 cmake-xbase64.patch
 libwps-0.4.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..f7af7bb
--- /dev/null
+++ b/debian/patches/upstream_cmake-find-PostgreSQL-9.6.patch
@@ -0,0 +1,25 @@
+From 843c41decfa85e351349f7a410893ac85c9d60b7 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <pino at kde.org>
+Date: Sat, 8 Oct 2016 16:17:17 +0200
+Subject: [PATCH] cmake: find PostgreSQL 9.6
+
+---
+ cmake/modules/FindCalligraPostgreSQL.cmake | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/cmake/modules/FindCalligraPostgreSQL.cmake b/cmake/modules/FindCalligraPostgreSQL.cmake
+index 035508b..98a1e88 100644
+--- a/cmake/modules/FindCalligraPostgreSQL.cmake
++++ b/cmake/modules/FindCalligraPostgreSQL.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.9.3
+

-- 
Calligra suite packaging