[SCM] kdb packaging branch, master, updated. debian/3.0.0-2-4-g8dec62f

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 0bfcbe44c3a44084112c6e03755341aebfb3153c
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jun 24 11:10:02 2017 +0200

    update the patches
    
    - upstream_cmake-find-PostgreSQL-9.6.patch: drop, backported from
      upstream
---
 debian/changelog                                   |  2 ++
 debian/patches/series                              |  1 -
 .../upstream_cmake-find-PostgreSQL-9.6.patch       | 25 ----------------------
 3 files changed, 2 insertions(+), 26 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0a31fcb..9ff8f39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kdb (3.0.1.1-0r1) UNRELEASED; urgency=medium
 
   [ Pino Toscano ]
   * New upstream release.
+  * Update the patches:
+    - upstream_cmake-find-PostgreSQL-9.6.patch: drop, backported from upstream
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Jun 2017 11:08:51 +0200
 
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 439e58a..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-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
deleted file mode 100644
index 4fcd4f8..0000000
--- a/debian/patches/upstream_cmake-find-PostgreSQL-9.6.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-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