# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1583313484 -3600
# Node ID 0503e835c77de7e32d5dcd02e58c67b61cf72e1a
# Parent  9b0e7a4b6749da0561e5e33b6aea56d59a6b58f6# Parent  1e19bf059f49747d3f28ab8e3cf24607c7a64689
back to mainline

diff -r 9b0e7a4b6749 -r 0503e835c77d CMakeLists.txt
--- a/CMakeLists.txt	Wed Mar 04 09:06:34 2020 +0100
+++ b/CMakeLists.txt	Wed Mar 04 10:18:04 2020 +0100
@@ -27,7 +27,7 @@
   set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "1.5.8")
+  set(ORTHANC_FRAMEWORK_DEFAULT_VERSION "ae0e3fd609df")  # This is pre-1.6.0
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 9b0e7a4b6749 -r 0503e835c77d NEWS
--- a/NEWS	Wed Mar 04 09:06:34 2020 +0100
+++ b/NEWS	Wed Mar 04 10:18:04 2020 +0100
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Version 1.1 (2020-03-04)
+========================
+
 New features
 ------------
 
diff -r 9b0e7a4b6749 -r 0503e835c77d Resources/Orthanc/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Wed Mar 04 09:06:34 2020 +0100
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Wed Mar 04 10:18:04 2020 +0100
@@ -112,6 +112,17 @@
         set(ORTHANC_FRAMEWORK_MD5 "e1b76f01116d9b5d4ac8cc39980560e3")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.8")
         set(ORTHANC_FRAMEWORK_MD5 "82323e8c49a667f658a3639ea4dbc336")
+
+      # Below this point are development snapshots that were used to
+      # release some plugin, before an official release of the Orthanc
+      # framework was available. Here is the command to be used to
+      # generate a proper archive:
+      #
+      #   $ hg archive /tmp/Orthanc-`hg id -i | sed 's/\+//'`.tar.gz
+      #
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "ae0e3fd609df")
+        # DICOMweb 1.1 (framework pre-1.6.0)
+        set(ORTHANC_FRAMEWORK_MD5 "7e09e9b530a2f527854f0b782d7e0645")
       endif()
     endif()
   endif()