From c18f09d344631096b5d30bc3828aa9164c3b93a0 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 23 Mar 2017 15:22:55 +0100
Subject: [PATCH] start new version 6.0.1

---
 CHANGELOG                          |  4 ++++
 Makefile                           |  2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php |  2 +-
 SeedDMS_Core/package.xml           | 28 ++++++++++++++++++++++++++++
 inc/inc.Version.php                |  2 +-
 install/install.php                |  2 +-
 6 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index f023bac97..eecc24627 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+--------------------------------------------------------------------------------
+                     Changes in version 6.0.1
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 6.0.0
 --------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 4775ba05b..67e38fbc3 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=6.0.0
+VERSION=6.0.1
 SRC=CHANGELOG inc conf utils index.php languages views op out controllers doc styles TODO LICENSE webdav install restapi pdfviewer
 # webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 8bc37c0e7..1b7177147 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -442,7 +442,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '6.0.0';
+			$this->version = '6.0.1';
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index ebdebfc90..9d57e424a 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -1389,5 +1389,33 @@ SeedDMS_Core_DMS::getNotificationsByUser() are deprecated
 - added postgres support
    </notes>
   </release>
+  <release>
+   <date>2017-02-28</date>
+   <time>06:34:50</time>
+   <version>
+    <release>6.0.0</release>
+    <api>6.0.0</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- all changes from 5.1.1 merged
+- SeedDMS_Core_User::getReceiptStatus() and SeedDMS_Core_User::getReviewStatus()
+only return entries of the latest document version if not specific document and
+version is passed
+- temp. table for revisions can be created
+- new methods SeedDMS_Core_DMS::getDocumentsInReception() and
+SeedDMS_Core_DMS::getDocumentsInRevision()
+- limit hits of sql statement in SeedDMЅ_Core_DMS::getDuplicateDocumentContent() to 1000
+- finishRevsion() puts all revisors into state waiting, so a new revision can be started
+- fix SeedDMS_Core_Group::getRevisionStatus(), which did not always return the last
+log entry first
+- add roles
+- use classname from SeedDMS_Core_DMS::_classnames for SeedDMS_Core_DocumentContent
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index a258f57dd..db395aba2 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "6.0.0";
+	public $_number = "6.0.1";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index 891219391..80d4ce39e 100644
--- a/install/install.php
+++ b/install/install.php
@@ -123,7 +123,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "6.0.0");
+define("SEEDDMS_VERSION", "6.0.1");
 
 require_once('../inc/inc.ClassSettings.php');