diff rhodecode/__init__.py @ 1209:45fed9a435b7

merges for upcoming release
author Marcin Kuzminski <marcin@python-works.com>
date Tue, 05 Apr 2011 12:08:34 +0200
parents bd102f45950f
children 73434499fa72
line wrap: on
line diff
--- a/rhodecode/__init__.py	Wed Mar 23 20:43:44 2011 +0100
+++ b/rhodecode/__init__.py	Tue Apr 05 12:08:34 2011 +0200
@@ -8,29 +8,28 @@
 
     :created_on: Apr 9, 2010
     :author: marcink
-    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>    
+    :copyright: (C) 2009-2011 Marcin Kuzminski <marcin@python-works.com>
     :license: GPLv3, see COPYING for more details.
 """
-# This program is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; version 2
-# of the License or (at your opinion) any later version of the license.
-# 
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
-# MA  02110-1301, USA.
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
 import platform
 
-VERSION = (1, 1, 7)
+VERSION = (1, 1, 8)
 __version__ = '.'.join((str(each) for each in VERSION[:4]))
-__dbversion__ = 2 #defines current db version for migrations
+__dbversion__ = 2  # defines current db version for migrations
 __platform__ = platform.system()
+__license__ = 'GPLv3'
 
 PLATFORM_WIN = ('Windows',)
 PLATFORM_OTHERS = ('Linux', 'Darwin', 'FreeBSD',)
@@ -45,6 +44,7 @@
 if len(VERSION) > 3 and _rev:
     __version__ += ' [rev:%s]' % _rev[0]
 
+
 def get_version():
     """Returns shorter version (digit parts only) as string."""