From: Ben Kaduk <kaduk@mit.edu>
Date: Tue, 5 May 2015 21:31:26 +0000 (-0400)
Subject: Ready for KfW 4.1 beta 1
X-Git-Tag: kfw-4.1-beta1~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b8a74c0d3ee126c8729e23cd502852631cbd92f9;p=thirdparty%2Fkrb5.git

Ready for KfW 4.1 beta 1

Bump versions as needed.
---

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 3d9d93636a..99f1980b6d 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -52,6 +52,6 @@
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 13
 #define KRB5_PATCHLEVEL 2
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_RELTAIL "kfw-4.1-beta1"
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.13"
+#define KRB5_RELTAG "kfw-4.1-beta1"
diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi
index 12a32dbf5c..db33e17a28 100644
--- a/src/windows/installer/wix/site-local.wxi
+++ b/src/windows/installer/wix/site-local.wxi
@@ -49,10 +49,10 @@
 
     <!-- At most one of the following could be defined and must correspond
          to the type of build performed. -->
-    <!--<?define Release?>-->
+    <?define Release?>
 
     <!-- Optional defines -->
-    <!-- <?define Beta="1"?>  --> <!-- Numeric Beta identifier -->
+    <?define Beta="1"?> <!-- Numeric Beta identifier -->
     <!-- <?define OldHelp?> --> <!-- Specifies the use of the old leash32.hlp file
                            instead of the new leash32.chm file -->
 
diff --git a/src/windows/kerberos.ver b/src/windows/kerberos.ver
index e6b8eca288..4ca6e63dca 100644
--- a/src/windows/kerberos.ver
+++ b/src/windows/kerberos.ver
@@ -52,8 +52,7 @@
 #define KRB5_MAJOR_RELEASE 4
 #define KRB5_MINOR_RELEASE 1
 #define KRB5_PATCHLEVEL 0
-#define KRB5_RELTAIL "prerelease"
+#define KRB5_RELTAIL "beta1"
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "trunk"
 
 #define KRB5_PRODUCTNAME_STR "MIT Kerberos for Windows"