[Inteproxy-commits] r260 - in trunk: . doc inteproxy packaging/Windows po
scm-commit@wald.intevation.org
scm-commit at wald.intevation.org
Wed May 26 14:40:24 CEST 2010
Author: bjoern
Date: 2010-05-26 14:40:20 +0200 (Wed, 26 May 2010)
New Revision: 260
Modified:
trunk/ChangeLog
trunk/doc/InteProxy-de.odt
trunk/doc/InteProxy-en.odt
trunk/inteproxy/gtkapp.py
trunk/inteproxy/main.py
trunk/packaging/Windows/Makefile
trunk/packaging/Windows/README.txt
trunk/packaging/Windows/inteproxy-installer.nsi
trunk/po/de.po
Log:
Ajustments and adaptions for the InteProxy Desktop 1.0.1 release.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2010-05-21 14:52:48 UTC (rev 259)
+++ trunk/ChangeLog 2010-05-26 12:40:20 UTC (rev 260)
@@ -1,3 +1,24 @@
+2010-05-26 Bjoern Schilberg <bjoern at intevation.de>
+
+ * packaging/Windows/Makefile: Adjust version numbers.
+
+ * packaging/Windows/inteproxy-installer.nsi: Adjust authors and
+ Copyright year
+
+ * inteproxy/main.py: Changed inteproxy_version to "1.0.1"
+
+ * inteproxy/gtkapp.py: Changed copyright to 2006 - 2010
+
+ * po/de.po: Changed msgid and msgstr to Copyright to 2006 - 2010
+
+ * packaging/Windows/README.txt: py2exe: Ignore the warning
+ about ssl, but be careful in the future, debug to be sure. More
+ detailed build step instruction for build step 2.1.
+
+ * doc/InteProxy-de.odt, doc/InteProxy-en.odt: Adapted the
+ documentation for the new 1.0.1 release. Added Info in 4.2
+ Configuration file for the show_terms_dialog option.
+
2010-05-21 Ingo Weinzierl <ingo.weinzierl at intevation.de>
* inteproxy/config.py: Wrapped a line that was longer than 80
Modified: trunk/doc/InteProxy-de.odt
===================================================================
(Binary files differ)
Modified: trunk/doc/InteProxy-en.odt
===================================================================
(Binary files differ)
Modified: trunk/inteproxy/gtkapp.py
===================================================================
--- trunk/inteproxy/gtkapp.py 2010-05-21 14:52:48 UTC (rev 259)
+++ trunk/inteproxy/gtkapp.py 2010-05-26 12:40:20 UTC (rev 260)
@@ -441,7 +441,7 @@
run_about_dialog(self, name=_("InteProxy"),
logo=load_image("InteProxy-logo.png"),
version=inteproxy.main.inteproxy_version,
- copyright=_("Copyright 2006 - 2009 by Intevation GmbH"),
+ copyright=_("Copyright 2006 - 2010 by Intevation GmbH"),
comments=_("InteProxy is distributed under the"
" GNU General Public License (GPL)"
" version 2 or later"),
Modified: trunk/inteproxy/main.py
===================================================================
--- trunk/inteproxy/main.py 2010-05-21 14:52:48 UTC (rev 259)
+++ trunk/inteproxy/main.py 2010-05-26 12:40:20 UTC (rev 260)
@@ -22,7 +22,7 @@
MasterWorkerServer,
log_date_time_string)
-inteproxy_version = "1.0.0"
+inteproxy_version = "1.0.1"
class DebugLogOut:
Modified: trunk/packaging/Windows/Makefile
===================================================================
--- trunk/packaging/Windows/Makefile 2010-05-21 14:52:48 UTC (rev 259)
+++ trunk/packaging/Windows/Makefile 2010-05-26 12:40:20 UTC (rev 260)
@@ -1,6 +1,6 @@
-VERSION_NUMBER=1.0.0 #needs the same format as dist dir, e.g. "dist-x.x.x-svnXXX"
-VERSION_DATE=20091210
-PRODUCTVERSION=1.0.0.0 #needs for version info of installer file (Format: x.x.x.x) = "VIProductVersion" in NSIS Installer
+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
all: # read all input files
Modified: trunk/packaging/Windows/README.txt
===================================================================
--- trunk/packaging/Windows/README.txt 2010-05-21 14:52:48 UTC (rev 259)
+++ trunk/packaging/Windows/README.txt 2010-05-26 12:40:20 UTC (rev 260)
@@ -15,7 +15,7 @@
1.2. cd InteProxy-0.2.0
python setup.py py2exe
- (You can ignore the warning about gdk and ltihooks)
+ (You can ignore the warning about gdk , ltihooks and ssl)
copy inteproxy.cfg dist\inteproxy.cfg
cd dist
mkdir doc
@@ -39,7 +39,9 @@
(method still a bit coarse, tested with NSIS 2.37.3 on Debian Lenny)
-2.1. Copy the final "dist" directory to present dir 'dist-${VERSION_NUMBER}'.
+2.1. Copy the final "dist" directory to present dir
+'dist-${VERSION_NUMBER}' and place the directory into the windows installer
+directory which contains the Makefile.
2.2. Edit Makefile:
* VERSION_NUMBER
Modified: trunk/packaging/Windows/inteproxy-installer.nsi
===================================================================
--- trunk/packaging/Windows/inteproxy-installer.nsi 2010-05-21 14:52:48 UTC (rev 259)
+++ trunk/packaging/Windows/inteproxy-installer.nsi 2010-05-26 12:40:20 UTC (rev 260)
@@ -1,6 +1,7 @@
-;Copyright (C) 2008-2009
+;Copyright (C) 2008-2010
;Authors:
;Emanuel Schütze <emanuel.schuetze at intevation.de>
+;Bjoern Schilberg <bjoern.schilberg at intevation.de>
;--------------------------------
@@ -14,7 +15,7 @@
!define PRODUCT_NAME "InteProxy Desktop"
!define PRODUCT_NAME_SHORT "InteProxy"
!define COMPANY "Intevation GmbH"
- !define COPYRIGHT "Copyright (C) 2008 - 2009 Intevation GmbH"
+ !define COPYRIGHT "Copyright (C) 2008 - 2010 Intevation GmbH"
!define DESCRIPTION "Security extension for unsecure OWS clients"
VIProductVersion "${PRODUCTVERSION}" ;needs format: x.x.x.x
Modified: trunk/po/de.po
===================================================================
--- trunk/po/de.po 2010-05-21 14:52:48 UTC (rev 259)
+++ trunk/po/de.po 2010-05-26 12:40:20 UTC (rev 260)
@@ -105,8 +105,8 @@
msgstr "InteProxy Fenster zeigen"
#: ../inteproxy/gtkapp.py:444
-msgid "Copyright 2006 - 2009 by Intevation GmbH"
-msgstr "Copyright 2006 - 2009 by Intevation GmbH"
+msgid "Copyright 2006 - 2010 by Intevation GmbH"
+msgstr "Copyright 2006 - 2010 by Intevation GmbH"
#: ../inteproxy/gtkapp.py:445
msgid ""
More information about the Inteproxy-commits
mailing list