# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1737133040 -3600
# Node ID a26f5e7d8b28873258c79225049d98eecccea8f9
# Parent  fa861cc5f8668e37c8db849c847a40723cb9c332# Parent  ffd136e649f953147a6c49e12be895c351e3a30f
back to mainline

diff -r fa861cc5f866 -r a26f5e7d8b28 CITATION.cff
--- a/CITATION.cff	Fri Jan 17 16:52:19 2025 +0100
+++ b/CITATION.cff	Fri Jan 17 17:57:20 2025 +0100
@@ -10,5 +10,5 @@
 doi: "10.1007/s10278-018-0082-y"
 license: "GPL-3.0-or-later"
 repository-code: "https://orthanc.uclouvain.be/hg/orthanc/"
-version: 1.12.3
-date-released: 2024-01-31
+version: 1.12.5
+date-released: 2024-12-17
diff -r fa861cc5f866 -r a26f5e7d8b28 CMakeLists.txt
--- a/CMakeLists.txt	Fri Jan 17 16:52:19 2025 +0100
+++ b/CMakeLists.txt	Fri Jan 17 17:57:20 2025 +0100
@@ -28,7 +28,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.0")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.5")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r fa861cc5f866 -r a26f5e7d8b28 NEWS
--- a/NEWS	Fri Jan 17 16:52:19 2025 +0100
+++ b/NEWS	Fri Jan 17 17:57:20 2025 +0100
@@ -1,8 +1,12 @@
 Pending changes in the mainline
 ===============================
 
-* Upgrade to VolView tag 4.3.0 (commit a76e8fb).  Note that the VolView about 
-  box displays version 4.2.0.
+
+Version 1.2 (2025-01-17)
+========================
+
+* Upgrade to VolView tag 4.3.0 (commit a76e8fb).
+  Note that the VolView "About" box still displays version 4.2.0.
 * Patch to make the build of static assets reproducible, following a
   suggestion by Bernhard M. Wiedemann (bwiedemann@suse.de)