[Inteproxy-commits] r339 - in trunk: . doc inteproxy packaging/Windows

[scm-commit@wald.intevation.org]

Author: bjoern
Date: 2012-01-11 12:22:46 +0100 (Wed, 11 Jan 2012)
New Revision: 339

Modified:
   trunk/ChangeLog
   trunk/doc/InteProxy-de.odt
   trunk/doc/InteProxy-en.odt
   trunk/inteproxy/main.py
   trunk/packaging/Windows/Makefile
Log:
Bumped version to 1.1.0.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-01-11 10:23:25 UTC (rev 338)
+++ trunk/ChangeLog	2012-01-11 11:22:46 UTC (rev 339)
@@ -1,4 +1,12 @@
 2012-01-11	Bjoern Schilberg	<bjoern.schilberg at intevation.de>
+	Bumped version to 1.1.0.
+
+	* packaging/Windows/Makefile: Adjust version numbers.
+	* inteproxy/main.py: Changed inteproxy_version to "1.1.0".
+	* doc/InteProxy-en.odt, doc/InteProxy-de.odt: Adapted the documentation
+	  for the new 1.1.0.
+
+2012-01-11	Bjoern Schilberg	<bjoern.schilberg at intevation.de>
 	Preparation for the InteProxy Desktop release 1.0.4.
 
 	* packaging/Windows/Makefile: Adjust version numbers.

Modified: trunk/doc/InteProxy-de.odt
===================================================================
(Binary files differ)

Modified: trunk/doc/InteProxy-en.odt
===================================================================
(Binary files differ)

Modified: trunk/inteproxy/main.py
===================================================================
--- trunk/inteproxy/main.py	2012-01-11 10:23:25 UTC (rev 338)
+++ trunk/inteproxy/main.py	2012-01-11 11:22:46 UTC (rev 339)
@@ -20,7 +20,7 @@
                                  MasterWorkerServer,
                                  log_date_time_string)
 
-inteproxy_version = "1.0.4"
+inteproxy_version = "1.1.0"
 
 class DebugLogOut:
 

Modified: trunk/packaging/Windows/Makefile
===================================================================
--- trunk/packaging/Windows/Makefile	2012-01-11 10:23:25 UTC (rev 338)
+++ trunk/packaging/Windows/Makefile	2012-01-11 11:22:46 UTC (rev 339)
@@ -1,6 +1,6 @@
-VERSION_NUMBER=1.0.4  #needs the same format as dist dir, e.g. "dist-x.x.x-svnXXX"
+VERSION_NUMBER=1.1.0  #needs the same format as dist dir, e.g. "dist-x.x.x-svnXXX"
 VERSION_DATE=20120111
-PRODUCTVERSION=1.0.4.0  #needs for version info of installer file (Format: x.x.x.x) = "VIProductVersion" in NSIS Installer
+PRODUCTVERSION=1.1.0.0  #needs for version info of installer file (Format: x.x.x.x) = "VIProductVersion" in NSIS Installer
 
 
 all:    # read all input files