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

[scm-commit at wald.intevation.org]

Author: bjoern
Date: 2013-06-25 15:04:08 +0200 (Tue, 25 Jun 2013)
New Revision: 364

Modified:
   trunk/ChangeLog
   trunk/doc/InteProxy-de.odt
   trunk/doc/InteProxy-en.odt
   trunk/inteproxy/gtkapp.py
   trunk/packaging/Windows/Makefile
   trunk/packaging/Windows/inteproxy-installer.nsi
   trunk/po/de.po
Log:
Bumped version to 1.2.0.


Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2012-03-28 13:49:01 UTC (rev 363)
+++ trunk/ChangeLog	2013-06-25 13:04:08 UTC (rev 364)
@@ -1,3 +1,14 @@
+2013-06-25	Bjoern Schilberg	<bjoern.schilberg at intevation.de>
+	Bumped version to 1.2.0.
+
+	* packaging/Windows/Makefile: Adjust version numbers.
+	* doc/InteProxy-en.odt, doc/InteProxy-de.odt: Adapted the documentation
+	  for the new 1.2.0.
+	* M packaging/Windows/inteproxy-installer.nsi,
+	  M inteproxy/gtkapp.py,
+	  M po/de.po:
+	  Adjusted date string to 2013.
+
 2012-03-28	Andre Heinecke	<aheinecke at intevation.de>
 	* M inteproxy/proxycore.py,
 	  M inteproxy/config.py,

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	2012-03-28 13:49:01 UTC (rev 363)
+++ trunk/inteproxy/gtkapp.py	2013-06-25 13:04:08 UTC (rev 364)
@@ -1,4 +1,4 @@
-# Copyright (C) 2007 - 2012 by Intevation GmbH
+# Copyright (C) 2007 - 2013 by Intevation GmbH
 # Authors:
 # Bernhard Herzog <bh at intevation.de>
 #
@@ -489,7 +489,7 @@
         run_about_dialog(self, name=_("InteProxy"),
                          logo=load_image("InteProxy-logo.png"),
                          version=inteproxy.main.inteproxy_version,
-                         copyright=_("Copyright 2006 - 2012 by Intevation GmbH"),
+                         copyright=_("Copyright 2006 - 2013 by Intevation GmbH"),
                          comments=_("InteProxy is distributed under the"
                                     " GNU General Public License (GPL)"
                                     " version 2 or later"),

Modified: trunk/packaging/Windows/Makefile
===================================================================
--- trunk/packaging/Windows/Makefile	2012-03-28 13:49:01 UTC (rev 363)
+++ trunk/packaging/Windows/Makefile	2013-06-25 13:04:08 UTC (rev 364)
@@ -1,5 +1,5 @@
 VERSION_NUMBER=1.2.0  #needs the same format as dist dir, e.g. "dist-x.x.x-svnXXX"
-VERSION_DATE=20120315
+VERSION_DATE=20130625
 PRODUCTVERSION=1.2.0.0  #needs for version info of installer file (Format: x.x.x.x) = "VIProductVersion" in NSIS Installer
 
 

Modified: trunk/packaging/Windows/inteproxy-installer.nsi
===================================================================
--- trunk/packaging/Windows/inteproxy-installer.nsi	2012-03-28 13:49:01 UTC (rev 363)
+++ trunk/packaging/Windows/inteproxy-installer.nsi	2013-06-25 13:04:08 UTC (rev 364)
@@ -15,7 +15,7 @@
   !define PRODUCT_NAME "InteProxy Desktop"
   !define PRODUCT_NAME_SHORT "InteProxy"
   !define COMPANY "Intevation GmbH"
-  !define COPYRIGHT "Copyright (C) 2008 - 2012 Intevation GmbH"
+  !define COPYRIGHT "Copyright (C) 2008 - 2013 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	2012-03-28 13:49:01 UTC (rev 363)
+++ trunk/po/de.po	2013-06-25 13:04:08 UTC (rev 364)
@@ -117,8 +117,8 @@
 msgstr "InteProxy Fenster zeigen"
 
 #: ../inteproxy/gtkapp.py:492
-msgid "Copyright 2006 - 2012 by Intevation GmbH"
-msgstr "Copyright 2006 - 2012 by Intevation GmbH"
+msgid "Copyright 2006 - 2013 by Intevation GmbH"
+msgstr "Copyright 2006 - 2013 by Intevation GmbH"
 
 #: ../inteproxy/gtkapp.py:493
 msgid ""