From 5ee711059785aabf8703519d012460e5c2b32801 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Wed, 3 Jan 2018 09:29:34 +0100
Subject: [PATCH] started new version 5.1.6

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

diff --git a/CHANGELOG b/CHANGELOG
index ded6bb2f8..04e575712 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,7 @@
+--------------------------------------------------------------------------------
+                     Changes in version 5.1.6
+--------------------------------------------------------------------------------
+
 --------------------------------------------------------------------------------
                      Changes in version 5.1.5
 --------------------------------------------------------------------------------
diff --git a/Makefile b/Makefile
index 0805e195a..5287b1aa9 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=5.1.5
+VERSION=5.1.6
 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 7c4e91b28..49a769aa0 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -371,7 +371,7 @@ class SeedDMS_Core_DMS {
 		$this->callbacks = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '5.1.5';
+			$this->version = '5.1.6';
 	} /* }}} */
 
 	/**
diff --git a/SeedDMS_Core/package.xml b/SeedDMS_Core/package.xml
index 7c7eb22d7..eb9e076a8 100644
--- a/SeedDMS_Core/package.xml
+++ b/SeedDMS_Core/package.xml
@@ -12,11 +12,11 @@
   <email>uwe@steinmann.cx</email>
   <active>yes</active>
  </lead>
- <date>2017-11-07</date>
+ <date>2018-01-07</date>
  <time>09:19:24</time>
  <version>
-  <release>5.1.5</release>
-  <api>5.1.5</api>
+  <release>5.1.6</release>
+  <api>5.1.6</api>
  </version>
  <stability>
   <release>stable</release>
@@ -24,18 +24,6 @@
  </stability>
  <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
  <notes>
-- use views instead of temp. tables
-- add list of expired documents in SeedDMS_Core_DMS::getDocumentList()
-- add methods to set comment, name, public, version of document files
-- add method SeedDMS_Core_Document::transferToUser()
-- SeedDMS_Core_Document::addDocumentFile() returns object of file
-- add SeedDMS_Core_DocumentFile::setDate()
-- remove SeedDMS_Core_DocumentCategory::addCategory() and getCategories()
-- add optional parameters $limit and $offset to SeedDMS_Core_Folder::getDocuments()
-  and SeedDMS_Core_Folder::getSubFolders()
-- getInstance() returns now null instead of false if the object was not found in the db
-- add new methods SeedDMS_Core_Document::addCategories() and
-  SeedDMS_Core_Document::removeCategories()
  </notes>
  <contents>
   <dir baseinstalldir="SeedDMS" name="/">
@@ -1545,5 +1533,32 @@ returns just users which are not disabled
 - all changes from 5.0.14 merged
    </notes>
   </release>
+  <release>
+   <date>2017-11-07</date>
+   <time>09:19:24</time>
+   <version>
+    <release>5.1.5</release>
+    <api>5.1.5</api>
+   </version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api>
+   </stability>
+   <license uri="http://opensource.org/licenses/gpl-license">GPL License</license>
+   <notes>
+- use views instead of temp. tables
+- add list of expired documents in SeedDMS_Core_DMS::getDocumentList()
+- add methods to set comment, name, public, version of document files
+- add method SeedDMS_Core_Document::transferToUser()
+- SeedDMS_Core_Document::addDocumentFile() returns object of file
+- add SeedDMS_Core_DocumentFile::setDate()
+- remove SeedDMS_Core_DocumentCategory::addCategory() and getCategories()
+- add optional parameters $limit and $offset to SeedDMS_Core_Folder::getDocuments()
+  and SeedDMS_Core_Folder::getSubFolders()
+- getInstance() returns now null instead of false if the object was not found in the db
+- add new methods SeedDMS_Core_Document::addCategories() and
+  SeedDMS_Core_Document::removeCategories()
+   </notes>
+  </release>
  </changelog>
 </package>
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index 3fcc1c88b..ddf140bb2 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	public $_number = "5.1.5";
+	public $_number = "5.1.6";
 	private $_string = "SeedDMS";
 
 	function __construct() {
diff --git a/install/install.php b/install/install.php
index ecf7d5870..643b8f190 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", "5.1.5");
+define("SEEDDMS_VERSION", "5.1.6");
 
 require_once('../inc/inc.ClassSettings.php');