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

[scm-commit@wald.intevation.org]

Author: sholl
Date: 2008-06-19 10:51:43 +0200 (Thu, 19 Jun 2008)
New Revision: 148

Modified:
   trunk/ChangeLog
   trunk/HowTo-Release.txt
   trunk/doc/InteProxy-de.odt
   trunk/doc/InteProxy-en.odt
   trunk/inteproxy/main.py
   trunk/packaging/Windows/Makefile
Log:
	* Preparations for the 0.4.0 release (website-links need to be
	  updated after the new release has been uploaded to wald to get
	  the correct link)
	
	* inteproxy/main.py, packaging/Windows/Makefile: adopted the
	  version-number to 0.4.0

	* doc/InteProxy-en.odt, doc/InteProxy-de.odt: Added description
	  for new URL-parameter --rewrite-urls, removed parameter
	  --allow-shutdown, adopted the version-number to 0.4.0 and the
	  release-date to 20.06.2008

	* HowTo-Release.txt: updated the new packaging-pathes



Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-06-16 10:38:34 UTC (rev 147)
+++ trunk/ChangeLog	2008-06-19 08:51:43 UTC (rev 148)
@@ -1,3 +1,19 @@
+2008-06-19  Stephan Holl    <stephan.holl at intevation.de>
+
+	* Preparations for the 0.4.0 release (website-links need to be
+	  updated after the new release has been uploaded to wald to get
+	  the correct link)
+	
+	* inteproxy/main.py, packaging/Windows/Makefile: adopted the
+	  version-number to 0.4.0
+
+	* doc/InteProxy-en.odt, doc/InteProxy-de.odt: Added description
+	  for new URL-parameter --rewrite-urls, removed parameter
+	  --allow-shutdown, adopted the version-number to 0.4.0 and the
+	  release-date to 20.06.2008
+
+	* HowTo-Release.txt: updated the new packaging-pathes
+
 2008-06-16  Bernhard Herzog  <bh at intevation.de>
 
 	* inteproxy/proxycore.py: Pass the response's version through to

Modified: trunk/HowTo-Release.txt
===================================================================
--- trunk/HowTo-Release.txt	2008-06-16 10:38:34 UTC (rev 147)
+++ trunk/HowTo-Release.txt	2008-06-19 08:51:43 UTC (rev 148)
@@ -5,7 +5,7 @@
 
 1. Take care everything is checked in properly.
    Adjust version numbers in
-   inteproxy.iss
+   packaging/Windows/Makefile (VERSION_NUMBER)
    inteproxy/main.py
    doc/InteProxy-de.odt
    doc/InteProxy-en.odt

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	2008-06-16 10:38:34 UTC (rev 147)
+++ trunk/inteproxy/main.py	2008-06-19 08:51:43 UTC (rev 148)
@@ -21,7 +21,7 @@
                                  MasterWorkerServer,
                                  log_date_time_string)
 
-inteproxy_version = "0.3.1"
+inteproxy_version = "0.4.0"
 
 
 def setup_logging(opts):

Modified: trunk/packaging/Windows/Makefile
===================================================================
--- trunk/packaging/Windows/Makefile	2008-06-16 10:38:34 UTC (rev 147)
+++ trunk/packaging/Windows/Makefile	2008-06-19 08:51:43 UTC (rev 148)
@@ -1,6 +1,6 @@
-VERSION_NUMBER=0.3.1-svn131  #needs the same format as dist dir, e.g. "dist-x.x.x-svnXXX"
-VERSION_DATE=20080609
-PRODUCTVERSION=0.3.1.131  #needs for version info of installer file (Format: x.x.x.x) = "VIProductVersion" in NSIS Installer
+VERSION_NUMBER=0.4.0  #needs the same format as dist dir, e.g. "dist-x.x.x-svnXXX"
+VERSION_DATE=20080623
+PRODUCTVERSION=0.4.0.XXX  #needs for version info of installer file (Format: x.x.x.x) = "VIProductVersion" in NSIS Installer
 
 
 all:    # read all input files