# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1628491804 -7200
# Node ID cc02a2aa8bab68cf6204bde9207cf30b854a76d0
# Parent  c563b7ad9931e7fc85e90e48a2cd098b363828c6# Parent  bbe70c24bc608379cbaf2a4148994ef964ca70c1
integration Orthanc-1.9.6->mainline

diff -r bbe70c24bc60 -r cc02a2aa8bab CITATION.cff
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/CITATION.cff	Mon Aug 09 08:50:04 2021 +0200
@@ -0,0 +1,14 @@
+cff-version: "1.1.0"
+message: "If you use this software, please cite it using these metadata."
+title: Orthanc
+abstract: "Orthanc is a lightweight open-source DICOM server for medical imaging supporting representational state transfer (REST)."
+authors:
+  -
+    affiliation: UCLouvain
+    family-names: Jodogne
+    given-names: "Sébastien"
+doi: "10.1007/s10278-018-0082-y"
+license: "GPL-3.0-or-later"
+repository-code: "https://hg.orthanc-server.com/orthanc/"
+version: 1.9.6
+date-released: 2021-07-21
diff -r bbe70c24bc60 -r cc02a2aa8bab NEWS
--- a/NEWS	Mon Aug 09 08:49:42 2021 +0200
+++ b/NEWS	Mon Aug 09 08:50:04 2021 +0200
@@ -1,6 +1,9 @@
 Pending changes in the mainline
 ===============================
 
+* Added file CITATION.cff
+* Linux Standard Base (LSB) builds of Orthanc can load non-LSB builds of plugins
+
 
 Version 1.9.6 (2021-07-21)
 ==========================
diff -r bbe70c24bc60 -r cc02a2aa8bab OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake
--- a/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Mon Aug 09 08:49:42 2021 +0200
+++ b/OrthancFramework/Resources/CMake/DownloadOrthancFramework.cmake	Mon Aug 09 08:50:04 2021 +0200
@@ -134,6 +134,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "6d5ca4a73ac7d42445041ca79de1624d")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.5")
         set(ORTHANC_FRAMEWORK_MD5 "10fc64de1254a095e5d3ed3931f0cfbb")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.9.6")
+        set(ORTHANC_FRAMEWORK_MD5 "4b5d05683d747c29b2860ad79d11e62e")
 
       # Below this point are development snapshots that were used to
       # release some plugin, before an official release of the Orthanc
diff -r bbe70c24bc60 -r cc02a2aa8bab OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake
--- a/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Mon Aug 09 08:49:42 2021 +0200
+++ b/OrthancFramework/Resources/CMake/OrthancFrameworkParameters.cmake	Mon Aug 09 08:50:04 2021 +0200
@@ -23,7 +23,7 @@
 #####################################################################
 
 # Version of the build, should always be "mainline" except in release branches
-set(ORTHANC_VERSION "1.9.6")
+set(ORTHANC_VERSION "mainline")
 
 # Version of the database schema. History:
 #   * Orthanc 0.1.0 -> Orthanc 0.3.0 = no versioning