[SCM] Calligra suite packaging branch, experimental, updated. debian/2.7.5-1-16-g0d05992

[Adrien Grellier]

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

The following commit has been merged in the experimental branch:
commit a627c6f4c27b20e699342945d7cc10ae594bc2a0
Author: Maximiliano Curia <maxy at debian.org>
Date:   Mon Dec 2 15:17:35 2013 +0100

    Add pqxx 4 support. (Closes: #730632)
---
 debian/changelog                   |  1 +
 debian/control                     |  2 +-
 debian/patches/pqxx_4_support.diff | 60 ++++++++++++++++++++++++++++++++++++++
 debian/patches/series              |  1 +
 4 files changed, 63 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index b6c4f09..af92dca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ calligra (1:2.7.5-1) UNRELEASED; urgency=low
 
   [ Maximiliano Curia ]
   * Migrate from eigen2 to eigen3, thanks to Anton Gladky. (Closes: #726643)
+  * Add pqxx 4 support. (Closes: #730632)
 
  -- Maximiliano Curia <maxy at debian.org>  Wed, 27 Nov 2013 10:20:58 +0100
 
diff --git a/debian/control b/debian/control
index 35eddfa..96d3059 100644
--- a/debian/control
+++ b/debian/control
@@ -32,7 +32,7 @@ Build-Depends: debhelper (>= 9), cmake (>= 2.6.2), pkg-kde-tools (>= 0.9),
  libpoppler-private-dev,
  libpoppler-qt4-dev,
  libpq-dev,
- libpqxx3-dev,
+ libpqxx-dev,
  libqca2-dev,
  libqt4-dev,
  libqt4-opengl-dev,
diff --git a/debian/patches/pqxx_4_support.diff b/debian/patches/pqxx_4_support.diff
new file mode 100644
index 0000000..100e400
--- /dev/null
+++ b/debian/patches/pqxx_4_support.diff
@@ -0,0 +1,60 @@
+Index: calligra-2.7.5/kexi/CMakeLists.txt
+===================================================================
+--- calligra-2.7.5.orig/kexi/CMakeLists.txt	2013-11-27 19:24:35.504323078 +0000
++++ calligra-2.7.5/kexi/CMakeLists.txt	2013-11-27 19:24:35.504323078 +0000
+@@ -94,7 +94,6 @@
+ INCLUDE (FindPostgreSQL)
+ 
+ set (PQXX_MIN_VERSION "3.0.0")
+-set (PQXX_MAX_VERSION "4.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")
+@@ -102,11 +101,11 @@
+ pkg_check_modules (PQXX libpqxx)
+ 
+ IF (POSTGRESQL_FOUND AND PQXX_FOUND)
+-   IF (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
++   IF (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION)
+       macro_log_feature(PQXX_FOUND "libpqxx" "Official C++ client API for PostgreSQL" "http://pqxx.org/development/libpqxx/" FALSE "" "Required by Kexi PostgreSQL driver")
+-   ELSE (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
+-      macro_log_feature(FALSE "libpqxx" "Official C++ client API for PostgreSQL, version >= ${PQXX_MIN_VERSION} and older than ${PQXX_MAX_VERSION}" "http://pqxx.org/development/libpqxx/" FALSE "" "Required by Kexi PostgreSQL driver")
+-   ENDIF (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
++   ELSE (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION)
++      macro_log_feature(FALSE "libpqxx" "Official C++ client API for PostgreSQL, version >= ${PQXX_MIN_VERSION}" "http://pqxx.org/development/libpqxx/" FALSE "" "Required by Kexi PostgreSQL driver")
++   ENDIF (PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION)
+ ENDIF (POSTGRESQL_FOUND AND PQXX_FOUND)
+ 
+ macro_optional_find_package(FreeTDS)
+Index: calligra-2.7.5/kexi/kexidb/drivers/CMakeLists.txt
+===================================================================
+--- calligra-2.7.5.orig/kexi/kexidb/drivers/CMakeLists.txt	2013-11-24 13:09:38.000000000 +0000
++++ calligra-2.7.5/kexi/kexidb/drivers/CMakeLists.txt	2013-11-27 21:09:31.927938334 +0000
+@@ -7,9 +7,9 @@
+    add_subdirectory(mysql)
+ ENDIF (MYSQL_FOUND)
+ 
+-IF (POSTGRESQL_FOUND AND PQXX_FOUND AND PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
++IF (POSTGRESQL_FOUND AND PQXX_FOUND AND PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION)
+    add_subdirectory(pqxx)
+-ENDIF (POSTGRESQL_FOUND AND PQXX_FOUND AND PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
++ENDIF (POSTGRESQL_FOUND AND PQXX_FOUND AND PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION)
+ 
+ IF (FREETDS_FOUND)
+    add_subdirectory(sybase)
+Index: calligra-2.7.5/kexi/migration/CMakeLists.txt
+===================================================================
+--- calligra-2.7.5.orig/kexi/migration/CMakeLists.txt	2013-11-24 13:09:38.000000000 +0000
++++ calligra-2.7.5/kexi/migration/CMakeLists.txt	2013-11-28 06:07:01.472584445 +0000
+@@ -12,9 +12,9 @@
+   add_subdirectory( mysql )
+ ENDIF (MYSQL_FOUND)
+ 
+-IF (POSTGRESQL_FOUND AND PQXX_FOUND AND PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
++IF (POSTGRESQL_FOUND AND PQXX_FOUND AND PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION)
+   add_subdirectory( pqxx )
+-ENDIF (POSTGRESQL_FOUND AND PQXX_FOUND AND PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION AND PQXX_VERSION VERSION_LESS PQXX_MAX_VERSION)
++ENDIF (POSTGRESQL_FOUND AND PQXX_FOUND AND PQXX_VERSION VERSION_GREATER PQXX_MIN_VERSION)
+ 
+ IF(FREETDS_FOUND)
+   add_subdirectory(sybase)
diff --git a/debian/patches/series b/debian/patches/series
index 782512c..7c0248a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 add_keywords_to_desktop_files.patch
 eigen3.patch
+pqxx_4_support.diff

-- 
Calligra suite packaging