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

[scm-commit at wald.intevation.org]

Author: bjoern
Date: 2013-06-27 14:52:52 +0200 (Thu, 27 Jun 2013)
New Revision: 369

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.2.1.



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2013-06-26 14:54:54 UTC (rev 368)
+++ trunk/ChangeLog	2013-06-27 12:52:52 UTC (rev 369)
@@ -1,3 +1,11 @@
+2013-06-25	Bjoern Schilberg	<bjoern.schilberg at intevation.de>
+	Bumped version to 1.2.1.
+
+	* M packaging/Windows/Makefile: Adjust version numbers.
+	* M inteproxy/main.py: Changed inteproxy_version to "1.2.1".
+	* M doc/InteProxy-en.odt, M doc/InteProxy-de.odt:
+	  Adapted the documentation for the new 1.2.1.
+
 2013-06-26  Bernhard Herzog  <bh at intevation.de>
 
 	* inteproxy/proxycore.py

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	2013-06-26 14:54:54 UTC (rev 368)
+++ trunk/inteproxy/main.py	2013-06-27 12:52:52 UTC (rev 369)
@@ -20,7 +20,7 @@
                                  MasterWorkerServer,
                                  log_date_time_string)
 
-inteproxy_version = "1.2.0"
+inteproxy_version = "1.2.1"
 
 class DebugLogOut:
 

Modified: trunk/packaging/Windows/Makefile
===================================================================
--- trunk/packaging/Windows/Makefile	2013-06-26 14:54:54 UTC (rev 368)
+++ trunk/packaging/Windows/Makefile	2013-06-27 12:52:52 UTC (rev 369)
@@ -1,6 +1,6 @@
-VERSION_NUMBER=1.2.0  #needs the same format as dist dir, e.g. "dist-x.x.x-svnXXX"
-VERSION_DATE=20130625
-PRODUCTVERSION=1.2.0.0  #needs for version info of installer file (Format: x.x.x.x) = "VIProductVersion" in NSIS Installer
+VERSION_NUMBER=1.2.1  #needs the same format as dist dir, e.g. "dist-x.x.x-svnXXX"
+VERSION_DATE=20130627
+PRODUCTVERSION=1.2.1.0  #needs for version info of installer file (Format: x.x.x.x) = "VIProductVersion" in NSIS Installer
 
 
 all:    # read all input files