[med-svn] r22265 - in trunk/packages/orthanc-postgresql/trunk/debian: . patches

[Sebastien Jodogne]

Author: jodogne-guest
Date: 2016-06-29 15:11:18 +0000 (Wed, 29 Jun 2016)
New Revision: 22265

Added:
   trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5
Modified:
   trunk/packages/orthanc-postgresql/trunk/debian/changelog
   trunk/packages/orthanc-postgresql/trunk/debian/control
   trunk/packages/orthanc-postgresql/trunk/debian/patches/series
   trunk/packages/orthanc-postgresql/trunk/debian/postrm
   trunk/packages/orthanc-postgresql/trunk/debian/rules
Log:
Fix to find PostgreSQL 9.5 dev headers

Modified: trunk/packages/orthanc-postgresql/trunk/debian/changelog
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/changelog	2016-06-29 14:15:12 UTC (rev 22264)
+++ trunk/packages/orthanc-postgresql/trunk/debian/changelog	2016-06-29 15:11:18 UTC (rev 22265)
@@ -1,3 +1,10 @@
+orthanc-postgresql (2.0-2) UNRELEASED; urgency=medium
+
+  * Fix to find PostgreSQL 9.5 dev headers
+  * Add hardening flags
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Wed, 29 Jun 2016 17:02:36 +0200
+
 orthanc-postgresql (2.0-1) unstable; urgency=medium
 
   * New upstream version.

Modified: trunk/packages/orthanc-postgresql/trunk/debian/control
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/control	2016-06-29 14:15:12 UTC (rev 22264)
+++ trunk/packages/orthanc-postgresql/trunk/debian/control	2016-06-29 15:11:18 UTC (rev 22265)
@@ -4,24 +4,26 @@
            Andreas Tille <tille at debian.org>
 Section: science
 Priority: optional
-Standards-Version: 3.9.6
-Build-Depends: cmake (>= 2.8),
+Build-Depends: cmake,
                debhelper (>= 9),
                libboost-all-dev,
-               libgtest-dev (>= 1.6.0),
+               libgtest-dev,
                libjsoncpp-dev,
                libpq-dev,
-               orthanc-dev (>= 0.9.5),
+               orthanc-dev,
                postgresql-server-dev-all,
                unzip,
                uuid-dev
-Vcs-Browser: http://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-postgresql/trunk/
+Standards-Version: 3.9.8
+Vcs-Browser: https://anonscm.debian.org/viewvc/debian-med/trunk/packages/orthanc-postgresql/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-med/trunk/packages/orthanc-postgresql/trunk/
 Homepage: http://www.orthanc-server.com/static.php?page=postgresql
 
 Package: orthanc-postgresql
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, orthanc (>= 0.9.5)
+Depends: ${misc:Depends},
+         ${shlibs:Depends},
+         orthanc (>= 0.9.5)
 Suggests: postgresql
 Description: Plugins to use PostgreSQL as a database back-end to Orthanc
  Orthanc PostgreSQL is a set of two plugins to Orthanc, a lightweight,

Added: trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5	                        (rev 0)
+++ trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.5	2016-06-29 15:11:18 UTC (rev 22265)
@@ -0,0 +1,17 @@
+Description: Fix to find the development headers for PostgreSQL 9.5
+Author: Sebastien Jodogne <s.jodogne at gmail.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: OrthancPostgreSQL-2.0/Resources/CMake/FindPostgreSQL.cmake
+===================================================================
+--- OrthancPostgreSQL-2.0.orig/Resources/CMake/FindPostgreSQL.cmake
++++ OrthancPostgreSQL-2.0/Resources/CMake/FindPostgreSQL.cmake
+@@ -75,7 +75,7 @@ set(PostgreSQL_ROOT_DIR_MESSAGE "Set the
+ 
+ 
+ set(PostgreSQL_KNOWN_VERSIONS ${PostgreSQL_ADDITIONAL_VERSIONS}
+-    "9.4" "9.3" "9.2" "9.1" "9.0" "8.4" "8.3" "8.2" "8.1" "8.0")
++    "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.
+ if ( WIN32 )

Modified: trunk/packages/orthanc-postgresql/trunk/debian/patches/series
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/patches/series	2016-06-29 14:15:12 UTC (rev 22264)
+++ trunk/packages/orthanc-postgresql/trunk/debian/patches/series	2016-06-29 15:11:18 UTC (rev 22265)
@@ -1,2 +1,2 @@
 shlibs
-
+postgresql-9.5

Modified: trunk/packages/orthanc-postgresql/trunk/debian/postrm
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/postrm	2016-06-29 14:15:12 UTC (rev 22264)
+++ trunk/packages/orthanc-postgresql/trunk/debian/postrm	2016-06-29 15:11:18 UTC (rev 22265)
@@ -13,8 +13,6 @@
      		/etc/init.d/orthanc restart
      	    fi
      	fi
-
-	ldconfig
 	;;
 
     failed-upgrade|abort-install|abort-upgrade|disappear)

Modified: trunk/packages/orthanc-postgresql/trunk/debian/rules
===================================================================
--- trunk/packages/orthanc-postgresql/trunk/debian/rules	2016-06-29 14:15:12 UTC (rev 22264)
+++ trunk/packages/orthanc-postgresql/trunk/debian/rules	2016-06-29 15:11:18 UTC (rev 22265)
@@ -6,6 +6,8 @@
 export TARGET_INDEX := libOrthancPostgreSQLIndex.so
 export TARGET_STORAGE := libOrthancPostgreSQLStorage.so
 
+export DEB_BUILD_MAINT_OPTIONS := hardening=+all
+
 %:
 	dh $@ --parallel --builddirectory=Build