[med-svn] [Git][med-team/orthanc-postgresql][master] 4 commits: Fix FTBFS with PostgreSQL 12 and forthcoming 13. Closes: #966613

[Sebastien Jodogne]

Sebastien Jodogne pushed to branch master at Debian Med / orthanc-postgresql


Commits:
8fd0ecf7 by jodogne-guest at 2020-08-02T11:15:22+02:00
Fix FTBFS with PostgreSQL 12 and forthcoming 13. Closes: #966613

- - - - -
3bd56a5f by jodogne-guest at 2020-08-02T11:16:45+02:00
removed d/compat

- - - - -
74adcc1c by jodogne-guest at 2020-08-02T11:28:20+02:00
postgresql-12 patch was forwarded upstream

- - - - -
93b1ba9d by jodogne-guest at 2020-08-02T11:33:05+02:00
Upload to unstable

- - - - -


5 changed files:

- debian/changelog
- − debian/compat
- debian/control
- + debian/patches/postgresql-12
- + debian/patches/series


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+orthanc-postgresql (3.2-3) unstable; urgency=medium
+
+  [ Dimitri John Ledkov and Gianfranco Costamagna ]
+  * Fix FTBFS with PostgreSQL 12 and forthcoming 13. Closes: #966613
+
+  [ Sebastien Jodogne ]
+  * debhelper-compat 13
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com>  Sun, 02 Aug 2020 11:10:59 +0200
+
 orthanc-postgresql (3.2-2) unstable; urgency=medium
 
   * Updated Orthanc framework to 1.7.0. Closes: #962229


=====================================
debian/compat deleted
=====================================
@@ -1 +0,0 @@
-10


=====================================
debian/control
=====================================
@@ -4,7 +4,7 @@ Uploaders: Sebastien Jodogne <s.jodogne at gmail.com>
 Section: science
 Priority: optional
 Build-Depends: cmake,
-               debhelper (>= 10),
+               debhelper-compat (= 13),
                libssl-dev,
                libboost-all-dev,
                libgtest-dev,


=====================================
debian/patches/postgresql-12
=====================================
@@ -0,0 +1,18 @@
+Description: Add pg12 to cmake detection.
+Author: Dimitri John Ledkov <xnox at ubuntu.com>
+Forwarded: yes
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: OrthancPostgreSQL-3.2/Resources/CMake/PostgreSQLConfiguration.cmake
+===================================================================
+--- OrthancPostgreSQL-3.2.orig/Resources/CMake/PostgreSQLConfiguration.cmake
++++ OrthancPostgreSQL-3.2/Resources/CMake/PostgreSQLConfiguration.cmake
+@@ -378,7 +378,7 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_LIBPQ
+ 
+ else()
+   set(PostgreSQL_ADDITIONAL_VERSIONS
+-    "11" "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")
++    "13" "12" "11" "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")
+   if (NOT WIN32)
+     foreach (suffix ${PostgreSQL_ADDITIONAL_VERSIONS})
+       list(APPEND PostgreSQL_ADDITIONAL_SEARCH_PATHS


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+postgresql-12



View it on GitLab: https://salsa.debian.org/med-team/orthanc-postgresql/-/compare/5648ddbb11ba590f32dfa625b3b9c1bd00703571...93b1ba9d684f96a207f2a2707e9a8c0c1ad62f5a

-- 
View it on GitLab: https://salsa.debian.org/med-team/orthanc-postgresql/-/compare/5648ddbb11ba590f32dfa625b3b9c1bd00703571...93b1ba9d684f96a207f2a2707e9a8c0c1ad62f5a
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20200802/1fbc826e/attachment-0001.html>