# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1524228475 -7200
# Node ID 8994bbdbc6d09f0824f789bb02e3d5b1b44e60e2
# Parent  1b22bbc8468bb45be630533ed8777656561f8547
set version

diff -r 1b22bbc8468b -r 8994bbdbc6d0 CMakeLists.txt
--- a/CMakeLists.txt	Fri Apr 20 14:43:36 2018 +0200
+++ b/CMakeLists.txt	Fri Apr 20 14:47:55 2018 +0200
@@ -21,13 +21,13 @@
 
 project(OrthancPostgreSQL)
 
-set(ORTHANC_POSTGRESQL_VERSION "mainline")
+set(ORTHANC_POSTGRESQL_VERSION "2.1")
 
 if (ORTHANC_POSTGRESQL_VERSION STREQUAL "mainline")
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.3.1")
+  set(ORTHANC_FRAMEWORK_VERSION "1.3.2")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
diff -r 1b22bbc8468b -r 8994bbdbc6d0 NEWS
--- a/NEWS	Fri Apr 20 14:43:36 2018 +0200
+++ b/NEWS	Fri Apr 20 14:47:55 2018 +0200
@@ -1,6 +1,10 @@
 Pending changes in the mainline
 ===============================
 
+
+Release 2.1 (2018-04-20)
+========================
+
 * Running transactions in "Serializable" isolation level to avoid 
   inconsistencies if multiple Orthanc are writing to the same DB
 * Upgrade to PostgreSQL 9.6.1 client library for static builds
@@ -12,7 +16,7 @@
 * Support of Linux Standard Base, OpenBSD and FreeBSD
 
 
-Release 2.0 (2015/12/02)
+Release 2.0 (2015-12-02)
 ========================
 
 => Minimum SDK version: 0.9.5 <=
@@ -22,7 +26,7 @@
 * The "value" column of tables "MainDicomTags" and "DicomIdentifiers" are now TEXT instead of BYTEA
 
 
-Release 1.3 (2015/10/07)
+Release 1.3 (2015-10-07)
 ========================
 
 => Minimum SDK version: 0.9.4 <=
@@ -33,7 +37,7 @@
 * Implementation of "UpgradeDatabase" extension
 
 
-Release 1.2 (2015/08/02)
+Release 1.2 (2015-08-02)
 ========================
 
 => Minimum SDK version: 0.9.1 <=
@@ -44,7 +48,7 @@
 * Support of OS X compilation
 
 
-Release 1.1 (2015/07/03)
+Release 1.1 (2015-07-03)
 ========================
 
 * Fixes
@@ -52,7 +56,7 @@
 * Support of FreeBSD thanks Mikhail <mp39590@gmail.com>
 
 
-Release 1.0 (2015/02/27)
+Release 1.0 (2015-02-27)
 ========================
 
 * Use of advisory locks
@@ -60,7 +64,7 @@
 * Options "EnableIndex" and "EnableStorage" to explicitly enable PostgreSQL
 
 
-2015/02/06
+2015-02-06
 ==========
 
 * Initial release