# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1531754633 -7200
# Node ID bde7f48dce411eab7673c9df9c62ce731286ee49
# Parent  00b9ab7e26a0cfd279ae539902f8d836038a2544# Parent  860542a0a64bb8f8150c5768997b53a54c84cb31
back to mainline

diff -r 00b9ab7e26a0 -r bde7f48dce41 PostgreSQL/CMakeLists.txt
--- a/PostgreSQL/CMakeLists.txt	Mon Jul 16 16:16:02 2018 +0200
+++ b/PostgreSQL/CMakeLists.txt	Mon Jul 16 17:23:53 2018 +0200
@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 2.8)
 project(OrthancPostgreSQL)
 
-set(ORTHANC_PLUGIN_VERSION "mainline")
+set(ORTHANC_PLUGIN_VERSION "2.2")
 
 if (ORTHANC_PLUGIN_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
diff -r 00b9ab7e26a0 -r bde7f48dce41 PostgreSQL/NEWS
--- a/PostgreSQL/NEWS	Mon Jul 16 16:16:02 2018 +0200
+++ b/PostgreSQL/NEWS	Mon Jul 16 17:23:53 2018 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Release 2.2 (2018-16-16)
+========================
+
 !! Important remark when upgrading from an older version of the plugin:
 
    The plugin will create a new index to improve search performance.
@@ -12,7 +16,7 @@
 * Migration into the "orthanc-databases" repository
 * Full refactoring to share code with MySQL
 * Fix issue 41 (Additional range IdentifierConstraintType in Orthanc)
-  => This fix requires SDK version: 1.4.0 <=
+  !! This fix requires Orthanc version >= 1.4.0
 * Fix issue 47 (Index improvements for PG plugin)
 * Fix issue 76 (PG connection shall reconnect/retry in case it loses
   the connection to the server)
diff -r 00b9ab7e26a0 -r bde7f48dce41 Resources/Orthanc/DownloadOrthancFramework.cmake
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Mon Jul 16 16:16:02 2018 +0200
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Mon Jul 16 17:23:53 2018 +0200
@@ -85,6 +85,8 @@
         set(ORTHANC_FRAMEWORK_MD5 "dac95bd6cf86fb19deaf4e612961f378")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.3.2")
         set(ORTHANC_FRAMEWORK_MD5 "d0ccdf68e855d8224331f13774992750")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.4.0")
+        set(ORTHANC_FRAMEWORK_MD5 "81e15f34d97ac32bbd7d26e85698835a")
       endif()
     endif()
   endif()