IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-02-25 18:55:28 -06:00
Code Issues Packages Projects Releases Wiki Activity

VERSION,Makefile: Rename "pre" to "alpha"

Browse Source 
Last time (2.1) we used "Preview/Testing" for the pre-beta release,
but the Git tags were still named alpha_*.

Use "alpha", remove "pre".
This commit is contained in:
Petr Viktorin 2014-09-30 11:48:20 +02:00
parent 00457a9c10
commit 9ba33971fa
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Makefile
View File

@ -23,8 +23,8 @@ endif # in a git tree and git returned a version
endif # git
ifndef IPA_VERSION
ifdef IPA_VERSION_PRE_RELEASE
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).pre$(IPA_VERSION_PRE_RELEASE)
ifdef IPA_VERSION_ALPHA_RELEASE
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).alpha$(IPA_VERSION_ALPHA_RELEASE)
else
ifdef IPA_VERSION_BETA_RELEASE
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE).beta$(IPA_VERSION_BETA_RELEASE)
@ -35,7 +35,7 @@ else
IPA_VERSION=$(IPA_VERSION_MAJOR).$(IPA_VERSION_MINOR).$(IPA_VERSION_RELEASE)
endif # rc
endif # beta
endif # pre
endif # alpha
endif # ipa_version
IPA_VENDOR_VERSION=$(IPA_VERSION)$(IPA_VENDOR_VERSION_SUFFIX)

17
VERSION
View File

@ -2,9 +2,10 @@
# freeIPA Version #
# #
# freeIPA versions are as follows #
# 1.0.x New production series #
# 1.0.x{pre,beta,rc}y Preview/Testing, Beta & RC #
# 1.0.0GITabcdefg Build from GIT #
# 1.0.x New production series #
# 1.0.x{alpha,beta,rc}y Alpha/Preview/Testing, Beta, #
# Release Candidate #
# 1.0.0GITabcdefg Build from GIT #
# #
########################################################
@ -23,14 +24,14 @@ IPA_VERSION_MINOR=0
IPA_VERSION_RELEASE=0
########################################################
# For 'pre' releases the version will be #
# For 'alpha' releases the version will be #
# #
# <MAJOR>.<MINOR>.<RELEASE>pre<PRE_RELEASE> #
# <MAJOR>.<MINOR>.<RELEASE>alpha<ALPHA_RELEASE> #
# #
# e.g. IPA_VERSION_PRE_RELEASE=1 #
# -> "1.0.0pre1" #
# e.g. IPA_VERSION_ALPHA_RELEASE=1 #
# -> "1.0.0alpha1" #
########################################################
IPA_VERSION_PRE_RELEASE=
IPA_VERSION_ALPHA_RELEASE=
########################################################
# For 'beta' releases the version will be #