changeset 1:ab6372adcfa8

bumped version to 1.5.0alpha imported from: moin--main--1.5--patch-1
author Thomas Waldmann <tw@waldmann-edv.de>
date Thu, 22 Sep 2005 15:26:48 +0000
parents 77665d8e2254
children 33b9a41e43bc
files MoinMoin/version.py docs/CHANGES moin.spec
diffstat 3 files changed, 11 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/MoinMoin/version.py	Thu Sep 22 15:09:50 2005 +0000
+++ b/MoinMoin/version.py	Thu Sep 22 15:26:48 2005 +0000
@@ -13,7 +13,7 @@
     patchlevel = 'release'
 
 project = "MoinMoin"
-release  = '1.3.5'
+release  = '1.5.0 alpha'
 revision = patchlevel
 
 if __name__ == '__main__':
--- a/docs/CHANGES	Thu Sep 22 15:09:50 2005 +0000
+++ b/docs/CHANGES	Thu Sep 22 15:26:48 2005 +0000
@@ -1,7 +1,7 @@
 MoinMoin Version History
 ========================
 
-Version moin--enterprise--1.3--patch-XXX:
+Version moin--main--1.5--patch-1:
     * Requirements changed to require Python >= 2.3. We recommend that you use
       the latest Python release you can get. The reason we dropped 2.2.2
       support is because no developer or tester uses this old version any more,
@@ -142,14 +142,7 @@
       that should fix quite some IE bugs and annoyances (on Win32).
       * for enabling IE7, use cfg.hacks = { 'ie7': True }
 
-
-Version 1.4:
-    We used that version number for an internal and early development version
-    for what will be called moin 2.0 at some time in the future.
-    There will never be a 1.4.x release.
-
-
-Trunk 1.3
+Merged from moin--main--1.3:
 
 Fixes:
 
@@ -202,7 +195,12 @@
     * Add support for running behind proxy out of the box with out
       manual url mapping.
       See HelpOnConfiguration/IntegratingWithApache
-    
+
+Version 1.4:
+    We used that version number for an internal and early development version
+    for what will be called moin 2.0 at some time in the future.
+    There will never be a 1.4.x release.
+
 
 Version 1.3.5 (2005-08-04, Revision moin--main--1.3--patch-883)
 
--- a/moin.spec	Thu Sep 22 15:09:50 2005 +0000
+++ b/moin.spec	Thu Sep 22 15:26:48 2005 +0000
@@ -1,6 +1,6 @@
 %define name moin
-%define version 1.3.5
-%define release 1
+%define version 1.5.0
+%define release 0.1.alpha0
 #Upgrade Path Example:
 #     moin-1.3-0.1.beta1
 #         Patched