changeset 5822:735ce48f60b2

bump version number to 1.9.4, update mig scripts
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 24 Jan 2012 20:49:50 +0100
parents 99e2309a7ec0
children 7cead19b1014
files MoinMoin/script/migration/1090300.py MoinMoin/script/migration/1090400.py MoinMoin/version.py moin.spec wiki/config/more_samples/ui_wikiconfig_snippet wiki/data/meta
diffstat 6 files changed, 22 insertions(+), 9 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/script/migration/1090300.py	Tue Jan 24 17:04:29 2012 +0100
+++ b/MoinMoin/script/migration/1090300.py	Tue Jan 24 20:49:50 2012 +0100
@@ -1,13 +1,13 @@
 # -*- coding: iso-8859-1 -*-
 """
-    MoinMoin - dummy migration terminator script
+    MoinMoin - migration from base rev 1090300
 
-    This must be the last migration script.
+    Nothing to do, we just return the new data dir revision.
 
-    @copyright: 2008 by Thomas Waldmann
+    @copyright: 2011 by Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
 
 def execute(script, data_dir, rev):
-    return None
+    return 1090400
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/script/migration/1090400.py	Tue Jan 24 20:49:50 2012 +0100
@@ -0,0 +1,13 @@
+# -*- coding: iso-8859-1 -*-
+"""
+    MoinMoin - dummy migration terminator script
+
+    This must be the last migration script.
+
+    @copyright: 2008 by Thomas Waldmann
+    @license: GNU GPL, see COPYING for details.
+"""
+
+def execute(script, data_dir, rev):
+    return None
+
--- a/MoinMoin/version.py	Tue Jan 24 17:04:29 2012 +0100
+++ b/MoinMoin/version.py	Tue Jan 24 20:49:50 2012 +0100
@@ -15,8 +15,8 @@
     patchlevel = 'release'
 
 project = "MoinMoin"
-release = '1.9.3'
-release_short = '193' # used for url_prefix_static
+release = '1.9.4'
+release_short = '194' # used for url_prefix_static
 revision = patchlevel
 
 def update():
--- a/moin.spec	Tue Jan 24 17:04:29 2012 +0100
+++ b/moin.spec	Tue Jan 24 20:49:50 2012 +0100
@@ -1,5 +1,5 @@
 %define name moin
-%define version 1.9.3
+%define version 1.9.4
 %define release 1
 #Upgrade Path Example:
 #     moin-1.3-0.1.beta1
--- a/wiki/config/more_samples/ui_wikiconfig_snippet	Tue Jan 24 17:04:29 2012 +0100
+++ b/wiki/config/more_samples/ui_wikiconfig_snippet	Tue Jan 24 20:49:50 2012 +0100
@@ -4,7 +4,7 @@
     # Wiki logo. You can use an image, text or both. [Unicode]
     # For no logo or text, use '' - the default is to show the sitename.
     # See also url_prefix setting below!
-    #logo_string = u'<img src="/moin_static193/common/moinmoin.png" alt="MoinMoin Logo">'
+    #logo_string = u'<img src="/moin_static194/common/moinmoin.png" alt="MoinMoin Logo">'
 
     # The default theme anonymous or new users get
     #theme_default = 'modern'
--- a/wiki/data/meta	Tue Jan 24 17:04:29 2012 +0100
+++ b/wiki/data/meta	Tue Jan 24 20:49:50 2012 +0100
@@ -1,1 +1,1 @@
-data_format_revision: 1090300
+data_format_revision: 1090400