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

scm-commit@wald.intevation.org scm-commit at wald.intevation.org
Fri Oct 29 19:57:22 CEST 2010 

Author: bjoern
Date: 2010-10-29 19:57:20 +0200 (Fri, 29 Oct 2010)
New Revision: 291

Modified:
   trunk/
   trunk/ChangeLog
   trunk/doc/InteProxy-de.odt
   trunk/doc/InteProxy-en.odt
   trunk/inteproxy/main.py
   trunk/packaging/Windows/Makefile
   trunk/website/index-de.htm4
   trunk/website/index.htm4
Log:
Merged revisions 286-287,289 via svnmerge from 
svn+ssh://bjoern@svn.wald.intevation.org/inteproxy/branches/release-1.0.3

........
  r286 | bjoern | 2010-10-28 18:45:54 +0200 (Thu, 28 Oct 2010) | 3 lines
  
  Ajustments and adaptions for the InteProxy Desktop 1.0.3 release.
........
  r287 | bjoern | 2010-10-29 11:49:16 +0200 (Fri, 29 Oct 2010) | 2 lines
  
  Added a note for using secured WFS-serivces with InteproxyDesktop.
........
  r289 | bjoern | 2010-10-29 19:31:58 +0200 (Fri, 29 Oct 2010) | 2 lines
  
  Updated file paths with the files from InteProxy Desktop release 1.0.3.
........



Property changes on: trunk
___________________________________________________________________
Name: svnmerge-integrated
   - /branches/release-1.0.3:1-285
   + /branches/release-1.0.3:1-290

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2010-10-29 17:53:27 UTC (rev 290)
+++ trunk/ChangeLog	2010-10-29 17:57:20 UTC (rev 291)
@@ -68,6 +68,23 @@
 	into 'perform_http_request' and moved the http and https connection into
 	own methods 'open_http_connection' and open_https_connection'.
 
+2010-10-29  Bjoern Schilberg <bjoern at intevation.de>
+
+	* website/index-de.htm4, website/index.htm4: Updated file paths
+	with the files from InteProxy Desktop release 1.0.3.
+
+2010-10-29  Bjoern Schilberg <bjoern at intevation.de>
+
+	* doc/InteProxy-en.odt, doc/InteProxy-de.odt: Added a note for  
+	  using secured WFS-serivces with InteproxyDesktop.
+
+2010-10-28  Bjoern Schilberg <bjoern at intevation.de>
+
+	* packaging/Windows/Makefile: Adjust version numbers.
+	* inteproxy/main.py: Changed inteproxy_version to "1.0.3".
+	* doc/InteProxy-en.odt, doc/InteProxy-de.odt: Adapted the documentation
+	  for the new 1.0.3.
+
 2010-09-20  Bernhard Herzog  <bh at intevation.de>
 
 	* inteproxy/proxyconnection.py: Removed.  It's no longer used.

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	2010-10-29 17:53:27 UTC (rev 290)
+++ trunk/inteproxy/main.py	2010-10-29 17:57:20 UTC (rev 291)
@@ -20,7 +20,7 @@
                                  MasterWorkerServer,
                                  log_date_time_string)
 
-inteproxy_version = "1.0.1"
+inteproxy_version = "1.0.3"
 
 class DebugLogOut:
 

Modified: trunk/packaging/Windows/Makefile
===================================================================
--- trunk/packaging/Windows/Makefile	2010-10-29 17:53:27 UTC (rev 290)
+++ trunk/packaging/Windows/Makefile	2010-10-29 17:57:20 UTC (rev 291)
@@ -1,6 +1,6 @@
-VERSION_NUMBER=1.0.1  #needs the same format as dist dir, e.g. "dist-x.x.x-svnXXX"
-VERSION_DATE=20100526
-PRODUCTVERSION=1.0.1.0  #needs for version info of installer file (Format: x.x.x.x) = "VIProductVersion" in NSIS Installer
+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
 
 
 all:    # read all input files

Modified: trunk/website/index-de.htm4
===================================================================
--- trunk/website/index-de.htm4	2010-10-29 17:53:27 UTC (rev 290)
+++ trunk/website/index-de.htm4	2010-10-29 17:57:20 UTC (rev 291)
@@ -55,7 +55,7 @@
 
 <h3>Windows Installationspakete:</h3>
 <p>
-<a href="http://wald.intevation.org/frs/download.php/740/InteProxy-1.0.1.exe">http://wald.intevation.org/frs/download.php/740/InteProxy-1.0.1.exe</a>
+<a href="http://wald.intevation.org/frs/download.php/796/InteProxy-1.0.3.exe">http://wald.intevation.org/frs/download.php/796/InteProxy-1.0.3.exe</a>
 </p>
 
 <!-- Cooming soon
@@ -68,12 +68,12 @@
 
 <h3>Quelltext:</h3>
 <p>
-<a href="http://wald.intevation.org/frs/download.php/743/InteProxy-1.0.1.tar.gz">http://wald.intevation.org/frs/download.php/743/InteProxy-1.0.1.tar.gz</a>
+<a href="http://wald.intevation.org/frs/download.php/793/InteProxy-1.0.3.tar.gz">http://wald.intevation.org/frs/download.php/793/InteProxy-1.0.3.tar.gz</a>
 </p>
 
 <h3>Benutzerhandbuch:</h3>
 <p>
-<a href="http://wald.intevation.org/frs/download.php/741/InteProxy-de-1.0.1.pdf">http://wald.intevation.org/frs/download.php/741/InteProxy-de-1.0.1.pdf</a>
+<a href="http://wald.intevation.org/frs/download.php/794/InteProxy-de-1.0.3.pdf">http://wald.intevation.org/frs/download.php/794/InteProxy-de-1.0.3.pdf</a>
 </p>
 
 <h2>Download InteProxy Server</h2>

Modified: trunk/website/index.htm4
===================================================================
--- trunk/website/index.htm4	2010-10-29 17:53:27 UTC (rev 290)
+++ trunk/website/index.htm4	2010-10-29 17:57:20 UTC (rev 291)
@@ -54,7 +54,7 @@
 
 <h3>Windows Installer:</h3>
 <p>
-<a href="http://wald.intevation.org/frs/download.php/740/InteProxy-1.0.1.exe">http://wald.intevation.org/frs/download.php/740/InteProxy-1.0.1.exe</a>
+<a href="http://wald.intevation.org/frs/download.php/796/InteProxy-1.0.3.exe">http://wald.intevation.org/frs/download.php/796/InteProxy-1.0.3.exe</a>
 </p>
 
 <!-- Cooming soon
@@ -67,12 +67,12 @@
 
 <h3>Source Code:</h3>
 <p>
-<a href="http://wald.intevation.org/frs/download.php/743/InteProxy-1.0.1.tar.gz">http://wald.intevation.org/frs/download.php/743/InteProxy-1.0.1.tar.gz</a>
+<a href="http://wald.intevation.org/frs/download.php/793/InteProxy-1.0.3.tar.gz">http://wald.intevation.org/frs/download.php/793/InteProxy-1.0.3.tar.gz</a>
 </p>
 
 <h3>User's Manual:</h3>
 <p>
-<a href="http://wald.intevation.org/frs/download.php/742/InteProxy-en-1.0.1.pdf">http://wald.intevation.org/frs/download.php/742/InteProxy-en-1.0.1.pdf</a>
+<a href="http://wald.intevation.org/frs/download.php/795/InteProxy-en-1.0.3.pdf">http://wald.intevation.org/frs/download.php/795/InteProxy-en-1.0.3.pdf</a>
 </p>
 
 <h2>Downloads InteProxy Server</h2>

More information about the Inteproxy-commits mailing list