[SCM] Calligra suite packaging branch, tip, updated. debian/2.6.4-1-51-g5a93d81

[Raúl Sánchez Siles]

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

The following commit has been merged in the tip branch:
commit 5a93d8113a91ed584728396aedf6e9eeaa4aa963
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Wed Dec 11 23:55:08 2013 +0100

    Added kexidb-relax_pqxx_version.patch to make pqxx driver build with libpqxx >= 0.4
---
 debian/changelog                               |  2 ++
 debian/patches/kexidb-relax_pqxx_version.patch | 13 +++++++++++++
 debian/patches/series                          |  1 +
 3 files changed, 16 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index de525ef..5c81f85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,8 @@ calligra (1:2.7.5-0r1) UNRELEASED; urgency=low
 
   [ Raúl Sánchez Siles ]
   * Move libcalligrakdgantt to calligra-libs from calligraplan.
+  * Added kexidb-relax_pqxx_version.patch to make pqxx driver build with
+    libpqxx >= 0.4
 
  -- Adrien Grellier <perso at adrieng.fr>  Sat, 27 Jul 2013 17:54:00 +0200
 
diff --git a/debian/patches/kexidb-relax_pqxx_version.patch b/debian/patches/kexidb-relax_pqxx_version.patch
new file mode 100644
index 0000000..4ca03ed
--- /dev/null
+++ b/debian/patches/kexidb-relax_pqxx_version.patch
@@ -0,0 +1,13 @@
+Index: calligra-2.7.5/kexi/CMakeLists.txt
+===================================================================
+--- calligra-2.7.5.orig/kexi/CMakeLists.txt	2013-11-24 14:49:21.000000000 +0100
++++ calligra-2.7.5/kexi/CMakeLists.txt	2013-12-06 21:31:21.000000000 +0100
+@@ -94,7 +94,7 @@
+ INCLUDE (FindPostgreSQL)
+ 
+ set (PQXX_MIN_VERSION "3.0.0")
+-set (PQXX_MAX_VERSION "4.0.0")
++set (PQXX_MAX_VERSION "5.0.0")
+ 
+ macro_optional_find_package(PostgreSQL)
+ macro_log_feature(POSTGRESQL_FOUND "libpq" "C application programmer's interface to PostgreSQL" "http://www.postgresql.org" FALSE "" "Required by Kexi PostgreSQL driver")
diff --git a/debian/patches/series b/debian/patches/series
index 182fc8a..af52a10 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 add_keywords_to_desktop_files.patch
+kexidb-relax_pqxx_version.patch

-- 
Calligra suite packaging