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

[scm-commit@wald.intevation.org]

Author: bjoern
Date: 2012-01-11 11:23:25 +0100 (Wed, 11 Jan 2012)
New Revision: 338

Modified:
   trunk/ChangeLog
   trunk/doc/InteProxy-de.odt
   trunk/doc/InteProxy-en.odt
   trunk/inteproxy/main.py
   trunk/packaging/Windows/Makefile
Log:
Preparation for the InteProxy Desktop release 1.0.4.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-01-05 12:22:46 UTC (rev 337)
+++ trunk/ChangeLog	2012-01-11 10:23:25 UTC (rev 338)
@@ -1,3 +1,11 @@
+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.
+	* inteproxy/main.py: Changed inteproxy_version to "1.0.4".
+	* doc/InteProxy-en.odt, doc/InteProxy-de.odt: Adapted the documentation
+	  for the new 1.0.4.
+
 2012-01-05	Sascha L. Teichmann	<sascha.teichmann at intevation.de>
 
 	* test/test_chunkedwriter.py: New. Unit tests for the chunkedwriter

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-05 12:22:46 UTC (rev 337)
+++ trunk/inteproxy/main.py	2012-01-11 10:23:25 UTC (rev 338)
@@ -20,7 +20,7 @@
                                  MasterWorkerServer,
                                  log_date_time_string)
 
-inteproxy_version = "1.0.3"
+inteproxy_version = "1.0.4"
 
 class DebugLogOut:
 

Modified: trunk/packaging/Windows/Makefile
===================================================================
--- trunk/packaging/Windows/Makefile	2012-01-05 12:22:46 UTC (rev 337)
+++ trunk/packaging/Windows/Makefile	2012-01-11 10:23:25 UTC (rev 338)
@@ -1,6 +1,6 @@
-VERSION_NUMBER=1.0.3  #needs the same format as dist dir, e.g. "dist-x.x.x-svnXXX"
-VERSION_DATE=20101028
-PRODUCTVERSION=1.0.3.0  #needs for version info of installer file (Format: x.x.x.x) = "VIProductVersion" in NSIS Installer
+VERSION_NUMBER=1.0.4  #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
 
 
 all:    # read all input files