[med-svn] [Git][med-team/orthanc-webviewer][master] 5 commits: upgraded Standards-Version
Sebastien Jodogne (@jodogne-guest)
gitlab at salsa.debian.org
Mon Apr 14 10:18:08 BST 2025
Sebastien Jodogne pushed to branch master at Debian Med / orthanc-webviewer
Commits:
99eadd06 by jodogne-guest at 2025-04-14T09:33:58+02:00
upgraded Standards-Version
- - - - -
795c8e88 by jodogne-guest at 2025-04-14T09:48:52+02:00
fix FTBFS due to recent updates to dcmtk
- - - - -
123128a2 by jodogne-guest at 2025-04-14T09:51:24+02:00
fix lintian warning: old-fsf-address-in-copyright-file
- - - - -
347d63c5 by jodogne-guest at 2025-04-14T11:04:40+02:00
fix compatibility with Orthanc >= 1.12.5
- - - - -
ab4cdcac by jodogne-guest at 2025-04-14T11:16:52+02:00
Upload to unstable
- - - - -
6 changed files:
- debian/changelog
- debian/control
- debian/copyright
- + debian/patches/access-modules
- debian/patches/series
- debian/rules
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+orthanc-webviewer (2.9+dfsg-2) unstable; urgency=medium
+
+ * Fix FTBFS due to recent updates to dcmtk. Closes: #1102781
+
+ -- Sebastien Jodogne <s.jodogne at gmail.com> Mon, 14 Apr 2025 09:33:21 +0200
+
orthanc-webviewer (2.9+dfsg-1) unstable; urgency=medium
* New upstream version.
=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Build-Depends: cmake,
uuid-dev,
yui-compressor,
zlib1g-dev
-Standards-Version: 4.6.2
+Standards-Version: 4.7.2
Vcs-Browser: https://salsa.debian.org/med-team/orthanc-webviewer
Vcs-Git: https://salsa.debian.org/med-team/orthanc-webviewer.git
Homepage: https://orthanc.uclouvain.be/book/plugins/webviewer.html
=====================================
debian/copyright
=====================================
@@ -59,8 +59,7 @@ License: AGPL-3.0+
Affero General Public License for more details.
.
You should have received a copy of the GNU Affero General Public License
- along with this package; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ along with this package. If not, see <https://www.gnu.org/licenses/>.
License: GPL-3.0+
@@ -75,8 +74,7 @@ License: GPL-3.0+
General Public License for more details.
.
You should have received a copy of the GNU General Public License along
- with this package; if not, write to the Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+ with this package. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public License
version 3 can be found in the file
@@ -116,9 +114,7 @@ License: GPL-2
details.
.
You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free
- Software Foundation, Inc., 51 Franklin St, Fifth Floor,
- Boston, MA 02110-1301 USA
+ License along with this package. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the full text of the GNU General Public
License version 2 can be found in the file
=====================================
debian/patches/access-modules
=====================================
@@ -0,0 +1,45 @@
+Description: Fix compatibility with Orthanc >= 1.12.5 (the images were not displayed)
+Author: Sebastien Jodogne <s.jodogne at orthanc-labs.com>
+Forwarded: https://orthanc.uclouvain.be/hg/orthanc-webviewer/rev/7fa1522f4569
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: OrthancWebViewer-2.9/Plugin/SeriesInformationAdapter.cpp
+===================================================================
+--- OrthancWebViewer-2.9.orig/Plugin/SeriesInformationAdapter.cpp
++++ OrthancWebViewer-2.9/Plugin/SeriesInformationAdapter.cpp
+@@ -2,8 +2,9 @@
+ * Orthanc - A Lightweight, RESTful DICOM Store
+ * Copyright (C) 2012-2016 Sebastien Jodogne, Medical Physics
+ * Department, University Hospital of Liege, Belgium
+- * Copyright (C) 2017-2024 Osimis S.A., Belgium
+- * Copyright (C) 2021-2024 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
++ * Copyright (C) 2017-2023 Osimis S.A., Belgium
++ * Copyright (C) 2024-2025 Orthanc Team SRL, Belgium
++ * Copyright (C) 2021-2025 Sebastien Jodogne, ICTEAM UCLouvain, Belgium
+ *
+ * This program is free software: you can redistribute it and/or
+ * modify it under the terms of the GNU Affero General Public License
+@@ -35,11 +36,18 @@ namespace OrthancPlugins
+ {
+ LOG(INFO) << "Ordering instances of series: " << seriesId;
+
+- Json::Value series, study, patient, ordered;
+- if (!GetJsonFromOrthanc(series, context_, "/series/" + seriesId) ||
+- !GetJsonFromOrthanc(study, context_, "/studies/" + series["ID"].asString() + "/module?simplify") ||
+- !GetJsonFromOrthanc(patient, context_, "/studies/" + series["ID"].asString() + "/module-patient?simplify") ||
+- !GetJsonFromOrthanc(ordered, context_, "/series/" + series["ID"].asString() + "/ordered-slices") ||
++ Json::Value series;
++ if (!GetJsonFromOrthanc(series, context_, "/series/" + seriesId))
++ {
++ return false;
++ }
++
++ const std::string studyId = series["ParentStudy"].asString();
++
++ Json::Value study, patient, ordered;
++ if (!GetJsonFromOrthanc(study, context_, "/studies/" + studyId + "/module?simplify") ||
++ !GetJsonFromOrthanc(patient, context_, "/studies/" + studyId + "/module-patient?simplify") ||
++ !GetJsonFromOrthanc(ordered, context_, "/series/" + seriesId + "/ordered-slices") ||
+ !series.isMember("Instances") ||
+ series["Instances"].type() != Json::arrayValue)
+ {
=====================================
debian/patches/series
=====================================
@@ -1 +1,2 @@
+access-modules
cmake
=====================================
debian/rules
=====================================
@@ -23,7 +23,7 @@ CMAKE_EXTRA_FLAGS += \
-DORTHANC_FRAMEWORK_SOURCE:STRING=system \
-DUSE_GOOGLE_TEST_DEBIAN_PACKAGE:BOOL=ON \
-DORTHANC_FRAMEWORK_USE_SHARED:BOOL=OFF \
- "-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES=boost_filesystem boost_iostreams boost_locale boost_regex boost_thread jsoncpp pugixml uuid sqlite3" \
+ "-DORTHANC_FRAMEWORK_ADDITIONAL_LIBRARIES=boost_filesystem boost_iostreams boost_locale boost_regex boost_thread jsoncpp pugixml uuid sqlite3 dcmdata ofstd dcmjpeg dcmjpls dcmimage" \
-DCMAKE_BUILD_TYPE=None # The build type must be set to None, see #711515
# Automated generation of the "Built-Using" attribute in "d/control"
View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/-/compare/05b82a8e3cffd8533e27e675afedf552f46cf71b...ab4cdcac33d3837c833d5b30eb5961804494c214
--
View it on GitLab: https://salsa.debian.org/med-team/orthanc-webviewer/-/compare/05b82a8e3cffd8533e27e675afedf552f46cf71b...ab4cdcac33d3837c833d5b30eb5961804494c214
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/20250414/476a47df/attachment-0001.htm>
More information about the debian-med-commit
mailing list