# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1449068880 -3600
# Node ID 569373c392dc065b5f45721dec9bcdaea04ab177
# Parent  2a32f1b034f715c3af204b464db8cd84d5e55b23# Parent  56dbbd7f5f785c5e343c60ab6a6e11b85d252615
back to mainline

diff -r 2a32f1b034f7 -r 569373c392dc CMakeLists.txt
--- a/CMakeLists.txt	Wed Dec 02 15:28:59 2015 +0100
+++ b/CMakeLists.txt	Wed Dec 02 16:08:00 2015 +0100
@@ -20,7 +20,7 @@
 
 project(OrthancPostgreSQL)
 
-set(ORTHANC_POSTGRESQL_VERSION "mainline")
+set(ORTHANC_POSTGRESQL_VERSION "2.0")
 
 
 # Parameters of the build
@@ -57,7 +57,7 @@
 
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_ORTHANC_SDK)
-  include_directories(${ORTHANC_ROOT}/Sdk-0.9.4)
+  include_directories(${ORTHANC_ROOT}/Sdk-0.9.5)
 else ()
   CHECK_INCLUDE_FILE_CXX(orthanc/OrthancCppDatabasePlugin.h HAVE_ORTHANC_H)
   if (NOT HAVE_ORTHANC_H)
diff -r 2a32f1b034f7 -r 569373c392dc NEWS
--- a/NEWS	Wed Dec 02 15:28:59 2015 +0100
+++ b/NEWS	Wed Dec 02 16:08:00 2015 +0100
@@ -1,10 +1,14 @@
 Pending changes in the mainline
 ===============================
 
+
+Release 2.0 (2015/12/02)
+========================
+
 => Minimum SDK version: 0.9.5 <=
 => Supported database versions: 5 (upgrade only) and 6 <=
 
-* Support version 6 of the database schema (for Orthanc >= 0.9.5)
+* Support version 6 of the database schema
 * The "value" column of tables "MainDicomTags" and "DicomIdentifiers" are now TEXT instead of BYTEA