From: Tom Yu <tlyu@mit.edu>
Date: Tue, 17 Aug 1999 02:09:49 +0000 (+0000)
Subject: 	* mkrel (reldate): Fix to deal with release branch snapshots
X-Git-Tag: krb5-1.2-beta1~291
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=5fc0efa16bae3a0238bcebf2225a8c9c1ba350b4;p=krb5.git

	* mkrel (reldate): Fix to deal with release branch snapshots

git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@11666 dc483132-0cff-0310-8789-dd5450dbe970
---

diff --git a/src/util/ChangeLog b/src/util/ChangeLog
index c72703068..2682795da 100644
--- a/src/util/ChangeLog
+++ b/src/util/ChangeLog
@@ -1,3 +1,7 @@
+1999-08-16  Tom Yu  <tlyu@mit.edu>
+
+	* mkrel (reldate): Fix to deal with release branch snapshots.
+
 Wed May 19 11:43:36 1999  Danilo Almeida  <dalmeida@mit.edu>
 
 	* Makefile.in: Add all and cleanup rules for windows for windows,
diff --git a/src/util/mkrel b/src/util/mkrel
index ae7a1ed37..e534a478f 100644
--- a/src/util/mkrel
+++ b/src/util/mkrel
@@ -54,6 +54,19 @@ krb5-*.*.*)
 	relminor=`echo $release|awk -F. '{print $2}'`
 	relpatch=`echo $release|awk -F. '{print $3}'`
 	;;
+krb5-*.*-current)
+	release=`echo $reldir|sed -e 's/krb5-//'`
+	relhead=`echo $release|sed -e 's/-.*//'`
+	relmajor=`echo $relhead|awk -F. '{print $1}'`
+	relminor=`echo $relhead|awk -F. '{print $2}'`
+	release=${relhead}-$reldate
+	;;
+krb5-*.*-*)
+	release=`echo $reldir|sed -e 's/krb5-//'`
+	relhead=`echo $release|sed -e 's/-.*//'`
+	relmajor=`echo $relhead|awk -F. '{print $1}'`
+	relminor=`echo $relhead|awk -F. '{print $2}'`
+	;;
 krb5-*.*)
 	release=`echo $reldir|sed -e 's/krb5-//'`
 	relmajor=`echo $release|awk -F. '{print $1}'`
@@ -62,9 +75,18 @@ krb5-*.*)
 krb5-current)
 	release=current-$reldate
 	;;
-*);;
+*)
+	release="$reldir"
+	;;
 esac
 
+echo "release=$release"
+echo "major=$relmajor minor=$relminor patch=$relpatch"
+
+# $release is used for send-pr
+# $reltag, $release, $reldate are used for brand.c currently
+# $relmajor, $relminor, $relpatch are used for patchlevel.h currently
+
 if test $checkout = t; then
 	echo "Checking out krb5 with tag $reltag into directory $reldir..."
 	cvs -q -d $repository export -r$reltag -d $reldir krb5