[SCM] Calligra suite packaging branch, master, updated. debian/2.7.5-1-5-g4d87686

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 4d87686ef48e712387f36c6bb4165e95ea88a86a
Author: Maximiliano Curia <maxy at debian.org>
Date:   Thu Dec 12 20:19:03 2013 +0100

    Remove obsolete patch: pqxx_4_support.diff
---
 debian/changelog                   |  3 ++
 debian/patches/pqxx_4_support.diff | 60 --------------------------------------
 2 files changed, 3 insertions(+), 60 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fbdfab9..f317621 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ calligra (1:2.7.5-1r1) UNRELEASED; urgency=low
   * Added kexidb-relax_pqxx_version.patch to make pqxx driver build with
     libpqxx >= 0.4
 
+  [ Maximiliano Curia ]
+  * Remove obsolete patch: pqxx_4_support.diff
+
  -- Adrien Grellier <perso at adrieng.fr>  Sat, 27 Jul 2013 17:54:00 +0200
 
 calligra (1:2.7.5-1) unstable; urgency=low
diff --git a/debian/patches/pqxx_4_support.diff b/debian/patches/pqxx_4_support.diff
deleted file mode 100644
index 100e400..0000000
--- a/debian/patches/pqxx_4_support.diff
+++ /dev/null
@@ -1,60 +0,0 @@
-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)

-- 
Calligra suite packaging