[Thuban-commits] r2775 - in trunk/thuban: . Thuban Thuban/UI

[scm-commit@wald.intevation.org]

Author: bernhard
Date: 2007-06-23 00:26:33 +0200 (Sat, 23 Jun 2007)
New Revision: 2775

Modified:
   trunk/thuban/ChangeLog
   trunk/thuban/Thuban/UI/about.py
   trunk/thuban/Thuban/version.py
Log:
* Thuban/version.py: Enable to indicate branch names in the 
thuban_release-svn-display.

* Thuban/UI/about.py: Mentioning the version number of the GNU GPL.


Modified: trunk/thuban/ChangeLog
===================================================================
--- trunk/thuban/ChangeLog	2007-06-22 22:14:15 UTC (rev 2774)
+++ trunk/thuban/ChangeLog	2007-06-22 22:26:33 UTC (rev 2775)
@@ -1,3 +1,10 @@
+2007-06-23  Bernhard Reiter <bernhard at intevation.de>
+
+	* Thuban/version.py: Enable to indicate branch names in the 
+	thuban_release-svn-display.
+
+	* Thuban/UI/about.py: Mentioning the version number of the GNU GPL.
+
 2007-06-22  Bernhard Reiter <bernhard at intevation.de>
 
 	INCOMPATIBLE CHANGE with Thuban 1.1 (development series) and 1.2.0:

Modified: trunk/thuban/Thuban/UI/about.py
===================================================================
--- trunk/thuban/Thuban/UI/about.py	2007-06-22 22:14:15 UTC (rev 2774)
+++ trunk/thuban/Thuban/UI/about.py	2007-06-22 22:26:33 UTC (rev 2775)
@@ -148,7 +148,7 @@
         text_title = wx.StaticText(self, -1,
             _("Thuban is a program for exploring geographic data.\n\n") +
             "Copyright 2001-2007 Intevation GmbH.\n" +
-            _("Thuban is licensed under the GNU GPL"),
+            _("Thuban is licensed under the GNU GPL v>=2"),
                                   style=wx.ST_NO_AUTORESIZE|wx.ALIGN_CENTRE)
 
         textBox = wx.TextCtrl(self, -1, text,

Modified: trunk/thuban/Thuban/version.py
===================================================================
--- trunk/thuban/Thuban/version.py	2007-06-22 22:14:15 UTC (rev 2774)
+++ trunk/thuban/Thuban/version.py	2007-06-22 22:26:33 UTC (rev 2775)
@@ -30,7 +30,9 @@
 #  thuban_release = "svn"
 #
 # the version string will be "Thuban 1.1 svn-20040224" (obviously the
-# actual date might differ :) ).  OTOH, given
+# actual date might differ :) ). You can add more behind the "svn" to 
+# e.g. to indicate a branch and the date will still be added.
+# OTOH, given
 #
 #  thuban_branch = "1.0"
 #  thuban_release = "1"
@@ -91,7 +93,7 @@
 
 versions = {}
 
-if thuban_release == "svn":
+if thuban_release[0:3] == "svn":
     version = '%s %s-%s' % (thuban_branch, thuban_release, get_date('%Y%m%d'))
     longversion = '%s\n%s' % (version, get_changelog_date())
 else: