[med-svn] [Git][med-team/orthanc-postgresql][master] 4 commits: use the shared liborthancframework instead of the static one
Sebastien Jodogne (@jodogne-guest)
gitlab at salsa.debian.org
Tue Apr 28 16:54:56 BST 2026
Sebastien Jodogne pushed to branch master at Debian Med / orthanc-postgresql
Commits:
8ae71905 by jodogne-guest at 2026-04-28T17:44:53+02:00
use the shared liborthancframework instead of the static one
- - - - -
c1d98b09 by jodogne-guest at 2026-04-28T17:47:01+02:00
fix FTBFS with recent versions of cmake
- - - - -
9b22608b by jodogne-guest at 2026-04-28T17:50:36+02:00
added minimum version on liborthancframework-dev
- - - - -
ca823a0a by jodogne-guest at 2026-04-28T17:54:02+02:00
Upload to unstable
- - - - -
4 changed files:
- debian/changelog
- debian/control
- debian/patches/cmake
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,11 @@
+orthanc-postgresql (5.0+dfsg-7) unstable; urgency=medium
+
+ * Use the shared Orthanc Framework library instead of the static one,
+ which necessitates using liborthancframework-dev >= 1.12.11+dfsg-5
+ for proper versioning of the shared library
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Tue, 28 Apr 2026 17:43:09 +0200
+
orthanc-postgresql (5.0+dfsg-6) unstable; urgency=medium
* Fix compatibility with Orthanc framework 1.12.11
=====================================
debian/control
=====================================
@@ -6,13 +6,12 @@ Priority: optional
Build-Depends: cmake,
debhelper-compat (= 13),
libgtest-dev,
- liborthancframework-dev,
+ liborthancframework-dev (>= 1.12.11+dfsg-5),
libpq-dev,
libprotobuf-dev,
orthanc-dev (>= 0.9.5),
postgresql-server-dev-all,
protobuf-compiler,
- uuid-dev,
unzip
Rules-Requires-Root: no
Standards-Version: 4.7.4
@@ -25,7 +24,6 @@ Architecture: any
Depends: ${misc:Depends},
${shlibs:Depends},
orthanc (>= 1.9.7+dfsg-6)
-Built-Using: ${orthancframework:Built-Using}
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,
=====================================
debian/patches/cmake
=====================================
@@ -3,10 +3,10 @@ Author: Sebastien Jodogne <s.jodogne at orthanc-labs.com>
Forwarded: https://orthanc.uclouvain.be/hg/orthanc-databases/rev/3d1faa34233f
---
This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: OrthancPostgreSQL-5.0/PostgreSQL/CMakeLists.txt
+Index: orthanc-postgresql-5.0+dfsg/PostgreSQL/CMakeLists.txt
===================================================================
---- OrthancPostgreSQL-5.0.orig/PostgreSQL/CMakeLists.txt
-+++ OrthancPostgreSQL-5.0/PostgreSQL/CMakeLists.txt
+--- orthanc-postgresql-5.0+dfsg.orig/PostgreSQL/CMakeLists.txt
++++ orthanc-postgresql-5.0+dfsg/PostgreSQL/CMakeLists.txt
@@ -18,7 +18,7 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>.
@@ -16,10 +16,10 @@ Index: OrthancPostgreSQL-5.0/PostgreSQL/CMakeLists.txt
project(OrthancPostgreSQL)
set(ORTHANC_PLUGIN_VERSION "5.0")
-Index: OrthancPostgreSQL-5.0/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
+Index: orthanc-postgresql-5.0+dfsg/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
===================================================================
---- OrthancPostgreSQL-5.0.orig/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
-+++ OrthancPostgreSQL-5.0/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
+--- orthanc-postgresql-5.0+dfsg.orig/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
++++ orthanc-postgresql-5.0+dfsg/Resources/Orthanc/CMake/DownloadOrthancFramework.cmake
@@ -475,11 +475,19 @@ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "s
include(CheckIncludeFile)
@@ -42,3 +42,22 @@ Index: OrthancPostgreSQL-5.0/Resources/Orthanc/CMake/DownloadOrthancFramework.cm
if (ORTHANC_FRAMEWORK_USE_SHARED)
list(GET CMAKE_FIND_LIBRARY_PREFIXES 0 Prefix)
+Index: orthanc-postgresql-5.0+dfsg/Resources/CMake/DatabasesFrameworkConfiguration.cmake
+===================================================================
+--- orthanc-postgresql-5.0+dfsg.orig/Resources/CMake/DatabasesFrameworkConfiguration.cmake
++++ orthanc-postgresql-5.0+dfsg/Resources/CMake/DatabasesFrameworkConfiguration.cmake
+@@ -53,7 +53,13 @@ endif()
+
+ if (ORTHANC_FRAMEWORK_SOURCE STREQUAL "system")
+ if (ORTHANC_FRAMEWORK_USE_SHARED)
+- include(FindBoost)
++ # https://cmake.org/cmake/help/latest/policy/CMP0167.html
++ if (CMAKE_VERSION VERSION_GREATER "3.30")
++ find_package(Boost CONFIG)
++ else()
++ include(FindBoost)
++ endif()
++
+ find_package(Boost COMPONENTS regex thread)
+
+ if (NOT Boost_FOUND)
=====================================
debian/rules
=====================================
@@ -22,18 +22,10 @@ CMAKE_EXTRA_FLAGS += \
-DUSE_GOOGLE_TEST_DEBIAN_PACKAGE:BOOL=ON \
-DORTHANC_FRAMEWORK_SOURCE=system \
-DDEB_VERSION=$(DEB_VERSION) \
- -DORTHANC_FRAMEWORK_USE_SHARED:BOOL=OFF \
- "-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES=boost_filesystem boost_iostreams boost_locale boost_regex boost_thread jsoncpp pugixml uuid" \
+ -DORTHANC_FRAMEWORK_USE_SHARED:BOOL=ON \
-DCMAKE_BUILD_TYPE=None # The build type must be set to None, see #711515
-# Automated generation of the "Built-Using" attribute in "d/control"
-# https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=989128
-# Adapted from:
-# https://wiki.debian.org/SIMDEverywhere#Approach (Point 6)
-override_dh_gencontrol:
- dh_gencontrol -- -Vorthancframework:Built-Using="$(shell dpkg-query -f '$${source:Package} (= $${source:Version}), ' -W liborthancframework-dev)"
-
override_dh_auto_configure:
dh_auto_configure --sourcedirectory=PostgreSQL -- $(CMAKE_EXTRA_FLAGS)
View it on GitLab: https://salsa.debian.org/med-team/orthanc-postgresql/-/compare/3184276880c9add5d668f153e975bf008cc4e8bd...ca823a0aefde1c1b88a7c547a41d6282a578ef27
--
View it on GitLab: https://salsa.debian.org/med-team/orthanc-postgresql/-/compare/3184276880c9add5d668f153e975bf008cc4e8bd...ca823a0aefde1c1b88a7c547a41d6282a578ef27
You're receiving this email because of your account on salsa.debian.org. Manage all notifications: https://salsa.debian.org/-/profile/notifications | Help: https://salsa.debian.org/help
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20260428/cd028a00/attachment-0001.htm>
More information about the debian-med-commit
mailing list