From 9ba33971fad5ec3b6fb5445669228b0ea9a89ec5 Mon Sep 17 00:00:00 2001
From: Petr Viktorin <pviktori@redhat.com>
Date: Tue, 30 Sep 2014 11:48:20 +0200
Subject: VERSION,Makefile: Rename "pre" to "alpha"

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".
---
 Makefile |  6 +++---
 VERSION  | 17 +++++++++--------
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/Makefile b/Makefile
index 3bdec716d..eca282a23 100644
--- a/Makefile
+++ b/Makefile
@@ -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)
diff --git a/VERSION b/VERSION
index 60c62a3e2..78ef7d8ec 100644
--- a/VERSION
+++ b/VERSION
@@ -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              #
-- 
cgit