From f559b74658a7d8d6257c65a1b421a0823ce5c2dd Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 May 2013 07:11:01 +0200
Subject: [PATCH 1/2] some more entries for 4.3.0

---
 CHANGELOG | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG b/CHANGELOG
index c8455c5d4..031d46faf 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -3,9 +3,11 @@
 --------------------------------------------------------------------------------
 - create preview images for attachted document files
 - expiration date cannot be set for the version as indicated by the gui.
-  I was always set for the document, but this was not clear from the
-	gui.
+  Even in the past it was set for the document, but this was not clear
+	for the user.
 - reorganization of ViewDocument page
+- maximum execution time of php scripts can be set in the settings
+  is now actually used.
 
 --------------------------------------------------------------------------------
                      Changes in version 4.2.1

From baf4b9a97904e642e7d0b0861e9091a855bf7495 Mon Sep 17 00:00:00 2001
From: Uwe Steinmann <steinm@debian.org>
Date: Thu, 2 May 2013 07:19:19 +0200
Subject: [PATCH 2/2] new version 4.2.1

---
 Makefile                           | 2 +-
 SeedDMS_Core/Core/inc.ClassDMS.php | 2 +-
 inc/inc.Version.php                | 2 +-
 install/install.php                | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index cee6fb096..b5d654491 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-VERSION=4.2.0
+VERSION=4.2.1
 SRC=CHANGELOG inc conf utils index.php languages views op out README.md README.Notification README.Ubuntu drop-tables-innodb.sql styles js TODO LICENSE Makefile webdav install
 #restapi webapp
 
diff --git a/SeedDMS_Core/Core/inc.ClassDMS.php b/SeedDMS_Core/Core/inc.ClassDMS.php
index 5a8c8abf0..961f58699 100644
--- a/SeedDMS_Core/Core/inc.ClassDMS.php
+++ b/SeedDMS_Core/Core/inc.ClassDMS.php
@@ -243,7 +243,7 @@ class SeedDMS_Core_DMS {
 		$this->convertFileTypes = array();
 		$this->version = '@package_version@';
 		if($this->version[0] == '@')
-			$this->version = '4.2.0';
+			$this->version = '4.2.1';
 	} /* }}} */
 
 	function getDB() { /* {{{ */
diff --git a/inc/inc.Version.php b/inc/inc.Version.php
index c80d812bc..ea6bdcd5c 100644
--- a/inc/inc.Version.php
+++ b/inc/inc.Version.php
@@ -20,7 +20,7 @@
 
 class SeedDMS_Version {
 
-	var $_number = "4.2.0";
+	var $_number = "4.2.1";
 	var $_string = "SeedDMS";
 
 	function SeedDMS_Version() {
diff --git a/install/install.php b/install/install.php
index 9e84f379b..de2a72eb6 100644
--- a/install/install.php
+++ b/install/install.php
@@ -116,7 +116,7 @@ function fileExistsInIncludePath($file) { /* {{{ */
  * Load default settings + set
  */
 define("SEEDDMS_INSTALL", "on");
-define("SEEDDMS_VERSION", "4.2.0");
+define("SEEDDMS_VERSION", "4.2.1");
 
 require_once('../inc/inc.ClassSettings.php');