# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1689265101 -7200
# Node ID 92b88fa3e631a68eb6bf97312cab69e27db63bbb
# Parent  0ad6bb263752d4f4ab0bb8fbbbb6d896c168ed3e# Parent  b28c815a625f11b38b9390b1b9015138bbf34e35
back to mainline

diff -r 0ad6bb263752 -r 92b88fa3e631 NEWS
--- a/NEWS	Thu Jul 13 17:24:25 2023 +0200
+++ b/NEWS	Thu Jul 13 18:18:21 2023 +0200
@@ -1,10 +1,14 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 2.0 (2023-10-07)
+========================
+
 * Support of IIIF
 * Automated extraction of the imaged volume if using OpenSlide
 * URI "/wsi/tiles/{id}/{z}/{x}/{y}" supports the "Accept" HTTP header
-  to force JPEG, JPEG2k or PNG in the decoded tiles
+  to force JPEG, JPEG2k, or PNG in the decoded tiles
 
 
 Version 1.1 (2021-12-11)
diff -r 0ad6bb263752 -r 92b88fa3e631 Resources/CMake/Version.cmake
--- a/Resources/CMake/Version.cmake	Thu Jul 13 17:24:25 2023 +0200
+++ b/Resources/CMake/Version.cmake	Thu Jul 13 18:18:21 2023 +0200
@@ -24,8 +24,13 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "b2e08d83e21d")  # Framework pre-1.9.8
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.12.1")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
+
+  # This definition is needed if Orthanc Framework <= 1.12.1
+  function(DefineSourceBasenameForTarget targetname)
+  endfunction()
+
 endif()
 
 add_definitions(