Author: jodogne-guest Date: 2017-10-16 07:46:45 +0000 (Mon, 16 Oct 2017) New Revision: 24374
Added: trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-10 Removed: trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.6 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/patches/shlibs trunk/packages/orthanc-postgresql/trunk/debian/rules trunk/packages/orthanc-postgresql/trunk/debian/watch Log: Fix to find PostgreSQL 10 dev headers. Closes: #878565 Modified: trunk/packages/orthanc-postgresql/trunk/debian/changelog =================================================================== --- trunk/packages/orthanc-postgresql/trunk/debian/changelog 2017-10-14 07:15:47 UTC (rev 24373) +++ trunk/packages/orthanc-postgresql/trunk/debian/changelog 2017-10-16 07:46:45 UTC (rev 24374) @@ -1,3 +1,9 @@ +orthanc-postgresql (2.0-4) UNRELEASED; urgency=medium + + * Fix to find PostgreSQL 10 dev headers. Closes: #878565 + + -- Sebastien Jodogne <[email protected]> Mon, 16 Oct 2017 09:20:09 +0200 + orthanc-postgresql (2.0-3) unstable; urgency=medium * Fix to find PostgreSQL 9.6 dev headers. Closes: #839309 Modified: trunk/packages/orthanc-postgresql/trunk/debian/control =================================================================== --- trunk/packages/orthanc-postgresql/trunk/debian/control 2017-10-14 07:15:47 UTC (rev 24373) +++ trunk/packages/orthanc-postgresql/trunk/debian/control 2017-10-16 07:46:45 UTC (rev 24374) @@ -14,10 +14,10 @@ postgresql-server-dev-all, unzip, uuid-dev -Standards-Version: 3.9.8 +Standards-Version: 4.1.1 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 +Homepage: https://www.orthanc-server.com/static.php?page=postgresql Package: orthanc-postgresql Architecture: any Added: trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-10 =================================================================== --- trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-10 (rev 0) +++ trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-10 2017-10-16 07:46:45 UTC (rev 24374) @@ -0,0 +1,17 @@ +Description: Fix #878565: orthanc-postgresql FTBFS with PostgreSQL 10 +Author: Sebastien Jodogne <[email protected]> +--- +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") ++ "10" "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. + if ( WIN32 ) Deleted: trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.6 =================================================================== --- trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.6 2017-10-14 07:15:47 UTC (rev 24373) +++ trunk/packages/orthanc-postgresql/trunk/debian/patches/postgresql-9.6 2017-10-16 07:46:45 UTC (rev 24374) @@ -1,17 +0,0 @@ -Description: Fix to find the development headers for PostgreSQL 9.6 -Author: Sebastien Jodogne <[email protected]> ---- -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.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. - if ( WIN32 ) Modified: trunk/packages/orthanc-postgresql/trunk/debian/patches/series =================================================================== --- trunk/packages/orthanc-postgresql/trunk/debian/patches/series 2017-10-14 07:15:47 UTC (rev 24373) +++ trunk/packages/orthanc-postgresql/trunk/debian/patches/series 2017-10-16 07:46:45 UTC (rev 24374) @@ -1,2 +1,2 @@ shlibs -postgresql-9.6 +postgresql-10 Modified: trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs =================================================================== --- trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs 2017-10-14 07:15:47 UTC (rev 24373) +++ trunk/packages/orthanc-postgresql/trunk/debian/patches/shlibs 2017-10-16 07:46:45 UTC (rev 24374) @@ -20,10 +20,10 @@ - SOVERSION ${ORTHANC_POSTGRESQL_VERSION} - ) +set_target_properties(OrthancPostgreSQLStorage PROPERTIES -+ LINK_FLAGS "-Wl,-soname,libOrthancPostgreSQLStorage.so.${ORTHANC_POSTGRESQL_VERSION}" ++ LINK_FLAGS "-Wl,-soname,libOrthancPostgreSQLStorage.so.${DEB_VERSION}" + NO_SONAME ON) +set_target_properties(OrthancPostgreSQLIndex PROPERTIES -+ LINK_FLAGS "-Wl,-soname,libOrthancPostgreSQLIndex.so.${ORTHANC_POSTGRESQL_VERSION}" ++ LINK_FLAGS "-Wl,-soname,libOrthancPostgreSQLIndex.so.${DEB_VERSION}" + NO_SONAME ON) install( Modified: trunk/packages/orthanc-postgresql/trunk/debian/rules =================================================================== --- trunk/packages/orthanc-postgresql/trunk/debian/rules 2017-10-14 07:15:47 UTC (rev 24373) +++ trunk/packages/orthanc-postgresql/trunk/debian/rules 2017-10-16 07:46:45 UTC (rev 24374) @@ -1,8 +1,9 @@ #!/usr/bin/make -f +include /usr/share/dpkg/pkg-info.mk # To access the "DEB_VERSION" variable + export JAVASCRIPT_LIBS := Build/javascript-libs -export DEBIAN_VERSION := $(shell dpkg-parsechangelog | sed -n -e 's/^Version: //p') -export UPSTREAM_VERSION := $(shell echo "$(DEBIAN_VERSION)" | cut -d '-' -f 1) +export UPSTREAM_VERSION := $(shell echo "$(DEB_VERSION)" | cut -d '+' -f 1) export TARGET_INDEX := libOrthancPostgreSQLIndex.so export TARGET_STORAGE := libOrthancPostgreSQLStorage.so @@ -15,6 +16,7 @@ -DCMAKE_SKIP_RPATH:BOOL=ON \ -DSTATIC_BUILD:BOOL=OFF \ -DUSE_GTEST_DEBIAN_SOURCE_PACKAGE:BOOL=ON \ + -DDEB_VERSION=$(DEB_VERSION) \ -DCMAKE_BUILD_TYPE="" # The build type must be left empty, see #711515 override_dh_auto_configure: Modified: trunk/packages/orthanc-postgresql/trunk/debian/watch =================================================================== --- trunk/packages/orthanc-postgresql/trunk/debian/watch 2017-10-14 07:15:47 UTC (rev 24373) +++ trunk/packages/orthanc-postgresql/trunk/debian/watch 2017-10-16 07:46:45 UTC (rev 24374) @@ -1,3 +1,3 @@ version=3 opts="downloadurlmangle=s/\/browse\.php\?path=//g" \ -http://www.orthanc-server.com/browse.php?path=/plugin-postgresql downloads/get\.php\?path=/plugin-postgresql/OrthancPostgreSQL-(\d\S*)\.tar\.gz +https://www.orthanc-server.com/browse.php?path=/plugin-postgresql downloads/get\.php\?path=/plugin-postgresql/OrthancPostgreSQL-(\d\S*)\.tar\.gz _______________________________________________ debian-med-commit mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/debian-med-commit
