changeset 6117:07e9f23e229f

bump version to 1.9.9rc1, add dummy mig script
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Tue, 20 Sep 2016 20:49:51 +0200
parents 2e5c8fcb6bee
children 814e2e2fc11f
files MoinMoin/script/migration/1090800.py MoinMoin/script/migration/1090900.py MoinMoin/version.py moin.spec wiki/data/meta
diffstat 5 files changed, 21 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/script/migration/1090800.py	Tue Sep 20 20:42:02 2016 +0200
+++ b/MoinMoin/script/migration/1090800.py	Tue Sep 20 20:49:51 2016 +0200
@@ -1,13 +1,12 @@
 # -*- coding: iso-8859-1 -*-
 """
-    MoinMoin - dummy migration terminator script
+    MoinMoin - migration from base rev 1090800
 
-    This must be the last migration script.
+    Nothing to do, we just return the new data dir revision.
 
-    @copyright: 2008 by Thomas Waldmann
+    @copyright: 2016 by Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
 
 def execute(script, data_dir, rev):
-    return None
-
+    return 1090900
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/script/migration/1090900.py	Tue Sep 20 20:49:51 2016 +0200
@@ -0,0 +1,12 @@
+# -*- coding: iso-8859-1 -*-
+"""
+    MoinMoin - dummy migration terminator script
+
+    This must be the last migration script.
+
+    @copyright: 2016 by Thomas Waldmann
+    @license: GNU GPL, see COPYING for details.
+"""
+
+def execute(script, data_dir, rev):
+    return None
--- a/MoinMoin/version.py	Tue Sep 20 20:42:02 2016 +0200
+++ b/MoinMoin/version.py	Tue Sep 20 20:49:51 2016 +0200
@@ -4,7 +4,7 @@
     MoinMoin - Version Information
 
     @copyright: 2000-2006 Juergen Hermann <jh@web.de>,
-                2003-2014 MoinMoin:ThomasWaldmann
+                2003-2016 MoinMoin:ThomasWaldmann
     @license: GNU GPL, see COPYING for details.
 """
 import sys
@@ -15,8 +15,8 @@
     patchlevel = 'release'
 
 project = "MoinMoin"
-release = '1.9.8'
-release_short = '198' # used for url_prefix_static
+release = '1.9.9rc1'
+release_short = '199'  # used for url_prefix_static
 revision = patchlevel
 
 def update():
@@ -40,4 +40,3 @@
         update()
     else:
         print project, release, revision
-
--- a/moin.spec	Tue Sep 20 20:42:02 2016 +0200
+++ b/moin.spec	Tue Sep 20 20:49:51 2016 +0200
@@ -1,5 +1,5 @@
 %define name moin
-%define version 1.9.8
+%define version 1.9.9-0.1.rc1
 %define release 1
 #Upgrade Path Example:
 #     moin-1.3-0.1.beta1
--- a/wiki/data/meta	Tue Sep 20 20:42:02 2016 +0200
+++ b/wiki/data/meta	Tue Sep 20 20:49:51 2016 +0200
@@ -1,1 +1,1 @@
-data_format_revision: 1090800
+data_format_revision: 1090900