Author: jtn
Date: Sat Feb 21 15:14:12 2015
New Revision: 28264

URL: http://svn.gna.org/viewcvs/freeciv?rev=28264&view=rev
Log:
Bump version number to '2.5.0-RC1+'.
Unset IS_BETA_VERSION.
Reset default follow tag to 'stable' (and Windows to 'win32').

Modified:
    branches/S2_5/fc_version
    branches/S2_5/win32/installer/Makefile

Modified: branches/S2_5/fc_version
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/fc_version?rev=28264&r1=28263&r2=28264&view=diff
==============================================================================
--- branches/S2_5/fc_version    (original)
+++ branches/S2_5/fc_version    Sat Feb 21 15:14:12 2015
@@ -7,7 +7,7 @@
 MAJOR_VERSION="2"
 MINOR_VERSION="5"
 PATCH_VERSION="0"
-VERSION_LABEL="-beta2+"
+VERSION_LABEL="-RC1+"
 
 # 1) Development until MAJOR and MINOR version numbers are
 #    set to new release series:
@@ -34,7 +34,7 @@
 
 IS_DEVEL_VERSION=0
 IS_FREEZE_VERSION=0
-IS_BETA_VERSION=1
+IS_BETA_VERSION=0
 
 NEXT_STABLE_VERSION="2.5.0"
 
@@ -42,7 +42,7 @@
 RELEASE_MONTH=3
 
 DATASUBDIR=2.5
-DEFAULT_FOLLOW_TAG=S2_5
+DEFAULT_FOLLOW_TAG=stable
 
 # Freeciv network capstring: see documentation in common/capstr.c
 #

Modified: branches/S2_5/win32/installer/Makefile
URL: 
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/win32/installer/Makefile?rev=28264&r1=28263&r2=28264&view=diff
==============================================================================
--- branches/S2_5/win32/installer/Makefile      (original)
+++ branches/S2_5/win32/installer/Makefile      Sat Feb 21 15:14:12 2015
@@ -51,7 +51,7 @@
        # create build directory
        mkdir -p build-$(GUI)
        # configure
-       cd build-$(GUI); ../../../configure --enable-client=$(GUI) 
--with-followtag="win32-S2_5" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP) 
$(EXTRA_CONFIG)
+       cd build-$(GUI); ../../../configure --enable-client=$(GUI) 
--with-followtag="win32" --enable-fcdb=sqlite3 --enable-fcmp=$(FCMP) 
$(EXTRA_CONFIG)
        # make
        make -C build-$(GUI)
 


_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits

Reply via email to