From 816c0623f3cb4e43fd58433f2f5ebfcd47cb452f Mon Sep 17 00:00:00 2001 From: Modestas Vainius Date: Sat, 16 Mar 2013 19:37:54 +0200 Subject: [PATCH] Drop FindPostgreSQL_665721.diff patch, merged upstream. --- debian/changelog | 1 + debian/patches/FindPostgreSQL_665721.diff | 18 ------------------ debian/patches/series | 1 - 3 files changed, 1 insertion(+), 19 deletions(-) delete mode 100644 debian/patches/FindPostgreSQL_665721.diff diff --git a/debian/changelog b/debian/changelog index 0552449ac..ddecc1049 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ cmake (2.8.11~rc1-1) UNRELEASED; urgency=low * Bump Standards-Version to 3.9.4: no changes needed. * Replace FindBoost_add_-lpthread_#563479.diff patch with a better version from upstream BTS and make it apply to current FindBoost. + * Drop FindPostgreSQL_665721.diff patch, merged upstream. -- Modestas Vainius Fri, 05 Oct 2012 21:00:55 +0300 diff --git a/debian/patches/FindPostgreSQL_665721.diff b/debian/patches/FindPostgreSQL_665721.diff deleted file mode 100644 index 39adbaf92..000000000 --- a/debian/patches/FindPostgreSQL_665721.diff +++ /dev/null @@ -1,18 +0,0 @@ -Description: Find postgresql headers on Debian -Author: Pere Nubiola i Radigales -Author: Gregor Jasny -Bug: http://bugs.debian.org/665721 -Acked-By: Modestas Vainius -Origin: other, http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=665721#17 -Last-Update: 2012-08-18 - ---- a/Modules/FindPostgreSQL.cmake -+++ b/Modules/FindPostgreSQL.cmake -@@ -116,6 +116,7 @@ - # Look in other places. - ${PostgreSQL_ROOT_DIRECTORIES} - PATH_SUFFIXES -+ postgresql - pgsql/server - postgresql/server - include/server diff --git a/debian/patches/series b/debian/patches/series index 524a1bd90..22e1e6817 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,3 @@ FindBoost_add_-lpthread_#563479.diff multiarch_findgtk2_fix.diff -FindPostgreSQL_665721.diff install_to_multiarch_libdir_on_kfreebsd_hurd.diff