changeset 5138:d57cfa1a3724

prepare 1.8.5 release: bump version number, add mig script
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Mon, 07 Sep 2009 13:39:16 +0200
parents f7052dd8d150
children 2b7f9e89e442
files MoinMoin/script/migration/1080400.py MoinMoin/script/migration/1080500.py MoinMoin/version.py docs/CHANGES moin.spec wiki/config/more_samples/ui_wikiconfig_snippet wiki/config/wikiconfig.py wiki/config/wikifarm/farmconfig.py wiki/data/meta wiki/server/moin.wsgi wiki/server/mointwisted.py wikiconfig.py
diffstat 12 files changed, 33 insertions(+), 20 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/script/migration/1080400.py	Mon Sep 07 13:28:47 2009 +0200
+++ b/MoinMoin/script/migration/1080400.py	Mon Sep 07 13:39:16 2009 +0200
@@ -1,13 +1,13 @@
 # -*- coding: iso-8859-1 -*-
 """
-    MoinMoin - dummy migration terminator script
+    MoinMoin - migration from base rev 1080400
 
-    This must be the last migration script.
+    Nothing to do, we just return the new data dir revision.
 
-    @copyright: 2008 by Thomas Waldmann
+    @copyright: 2009 by Thomas Waldmann
     @license: GNU GPL, see COPYING for details.
 """
 
 def execute(script, data_dir, rev):
-    return None
+    return 1080500
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/MoinMoin/script/migration/1080500.py	Mon Sep 07 13:39:16 2009 +0200
@@ -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	Mon Sep 07 13:28:47 2009 +0200
+++ b/MoinMoin/version.py	Mon Sep 07 13:39:16 2009 +0200
@@ -15,8 +15,8 @@
     patchlevel = 'release'
 
 project = "MoinMoin"
-release = '1.8.4'
-release_short = '184' # used for url_prefix_static
+release = '1.8.5'
+release_short = '185' # used for url_prefix_static
 revision = patchlevel
 
 def update():
--- a/docs/CHANGES	Mon Sep 07 13:28:47 2009 +0200
+++ b/docs/CHANGES	Mon Sep 07 13:39:16 2009 +0200
@@ -16,7 +16,7 @@
     editor_force = True
     editor_default = 'text'  # internal default, just for completeness
 
-Version 1.8.current:
+Version 1.8.5:
   Bug fixes:
     * Attachment links: fix processing of attributes (e.g. 'target', 'title')
     * Upgrade FCKeditor from 2.6.4 to 2.6.4.1.
--- a/moin.spec	Mon Sep 07 13:28:47 2009 +0200
+++ b/moin.spec	Mon Sep 07 13:39:16 2009 +0200
@@ -1,5 +1,5 @@
 %define name moin
-%define version 1.8.4
+%define version 1.8.5
 %define release 1
 #Upgrade Path Example:
 #     moin-1.3-0.1.beta1
--- a/wiki/config/more_samples/ui_wikiconfig_snippet	Mon Sep 07 13:28:47 2009 +0200
+++ b/wiki/config/more_samples/ui_wikiconfig_snippet	Mon Sep 07 13:39:16 2009 +0200
@@ -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_static184/common/moinmoin.png" alt="MoinMoin Logo">'
+    #logo_string = u'<img src="/moin_static185/common/moinmoin.png" alt="MoinMoin Logo">'
 
     # The default theme anonymous or new users get
     #theme_default = 'modern'
--- a/wiki/config/wikiconfig.py	Mon Sep 07 13:28:47 2009 +0200
+++ b/wiki/config/wikiconfig.py	Mon Sep 07 13:39:16 2009 +0200
@@ -38,7 +38,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_static184/common/moinmoin.png" alt="MoinMoin Logo">'
+    logo_string = u'<img src="/moin_static185/common/moinmoin.png" alt="MoinMoin Logo">'
 
     # name of entry page / front page [Unicode], choose one of those:
 
@@ -76,12 +76,12 @@
 
     # The URL prefix we use to access the static stuff (img, css, js).
     # NOT touching this is maybe the best way to handle this setting as moin
-    # uses a good internal default (something like '/moin_static184' for moin
-    # version 1.8.4).
+    # uses a good internal default (something like '/moin_static185' for moin
+    # version 1.8.5).
     # For Twisted and standalone server, the default will automatically work.
     # For others, you should make a matching server config (e.g. an Apache
     # Alias definition pointing to the directory with the static stuff).
-    #url_prefix_static = '/moin_static184'
+    #url_prefix_static = '/moin_static185'
 
 
     # Security ----------------------------------------------------------
--- a/wiki/config/wikifarm/farmconfig.py	Mon Sep 07 13:28:47 2009 +0200
+++ b/wiki/config/wikifarm/farmconfig.py	Mon Sep 07 13:39:16 2009 +0200
@@ -93,12 +93,12 @@
 
     # The URL prefix we use to access the static stuff (img, css, js).
     # NOT touching this is maybe the best way to handle this setting as moin
-    # uses a good internal default (something like '/moin_static184' for moin
-    # version 1.8.4).
+    # uses a good internal default (something like '/moin_static185' for moin
+    # version 1.8.5).
     # For Twisted and standalone server, the default will automatically work.
     # For others, you should make a matching server config (e.g. an Apache
     # Alias definition pointing to the directory with the static stuff).
-    #url_prefix_static = '/moin_static184'
+    #url_prefix_static = '/moin_static185'
 
 
     # Security ----------------------------------------------------------
--- a/wiki/data/meta	Mon Sep 07 13:28:47 2009 +0200
+++ b/wiki/data/meta	Mon Sep 07 13:39:16 2009 +0200
@@ -1,1 +1,1 @@
-data_format_revision: 01080400
+data_format_revision: 01080500
--- a/wiki/server/moin.wsgi	Mon Sep 07 13:28:47 2009 +0200
+++ b/wiki/server/moin.wsgi	Mon Sep 07 13:39:16 2009 +0200
@@ -5,7 +5,7 @@
     To use this, add those statements to your Apache's VirtualHost definition:
     
     # this is for icons, css, js (and must match url_prefix from wiki config):
-    Alias       /moin_static184/ /usr/share/moin/htdocs/
+    Alias       /moin_static185/ /usr/share/moin/htdocs/
 
     # this is the URL http://servername/moin/ you will use later to invoke moin:
     WSGIScriptAlias /moin/ /some/path/moin.wsgi
--- a/wiki/server/mointwisted.py	Mon Sep 07 13:28:47 2009 +0200
+++ b/wiki/server/mointwisted.py	Mon Sep 07 13:39:16 2009 +0200
@@ -47,7 +47,7 @@
     # URL prefix for the static stuff (used to access stuff in docs) - you
     # usually should not need to change this because Twisted moin uses
     # matching defaults for here and for wikiconfig.py:
-    #url_prefix_static = '/moin_static184'
+    #url_prefix_static = '/moin_static185'
 
     # The server will run with as this user and group (default 'www-data')
     user = 'www-data'
--- a/wikiconfig.py	Mon Sep 07 13:28:47 2009 +0200
+++ b/wikiconfig.py	Mon Sep 07 13:39:16 2009 +0200
@@ -19,7 +19,7 @@
     acl_rights_default = u"All:read,write,delete,revert,admin"
     surge_action_limits = None # no surge protection
     sitename = u'MoinMoin DesktopEdition'
-    logo_string = u'<img src="/moin_static184/common/moinmoin.png" alt="MoinMoin Logo">'
+    logo_string = u'<img src="/moin_static185/common/moinmoin.png" alt="MoinMoin Logo">'
     page_front_page = u'FrontPage' # change to some better value
     # ^^^ DON'T TOUCH THIS EXCEPT IF YOU KNOW WHAT YOU DO ^^^