changeset 629:cdfb01bec122 1.6a

bump revision to 1.6.0alpha
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 07 May 2006 21:24:48 +0200
parents dcb874ba84ba
children 191b5e074759 2402ec5c001f
files MoinMoin/version.py docs/CHANGES moin.spec
diffstat 3 files changed, 10 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/version.py	Sun May 07 21:09:09 2006 +0200
+++ b/MoinMoin/version.py	Sun May 07 21:24:48 2006 +0200
@@ -14,7 +14,7 @@
     patchlevel = 'release'
 
 project = "MoinMoin"
-release  = '1.5.3'
+release  = '1.6.0alpha'
 revision = patchlevel
 
 def update():
--- a/docs/CHANGES	Sun May 07 21:09:09 2006 +0200
+++ b/docs/CHANGES	Sun May 07 21:24:48 2006 +0200
@@ -28,6 +28,13 @@
     and improving it and after having made a backup with some other, proven
     method. USE BOTH ON YOUR OWN RISK!
 
+Version 1.6.current:
+    This is the active development branch. All changes get done here and
+    critical stuff gets committed with -m "... (backport to 1.5)" and then
+    backported to 1.5. :) Commits to 1.5 done in any other way are likely to
+    get reverted.
+
+
 Version 1.5.current:
   Developer notes:
     * We switched to Mercurial SCM, see here for more infos:
--- a/moin.spec	Sun May 07 21:09:09 2006 +0200
+++ b/moin.spec	Sun May 07 21:24:48 2006 +0200
@@ -1,6 +1,6 @@
 %define name moin
-%define version 1.5.3
-%define release 1
+%define version 1.6.0
+%define release 0.0.alpha
 #Upgrade Path Example:
 #     moin-1.3-0.1.beta1
 #         Patched