From: Ben Kaduk <kaduk@mit.edu>
Date: Wed, 24 Jun 2015 21:24:10 +0000 (-0400)
Subject: Ready for KfW 4.1 beta 2
X-Git-Tag: kfw-4.1-beta2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=84c35e8bc2c4ae8870d2c6204a877a61e2ee1130;p=thirdparty%2Fkrb5.git

Ready for KfW 4.1 beta 2

Bump versions as needed.
---

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 3d9d93636a..7fdc89145d 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-beta2"
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.13"
+#define KRB5_RELTAG "kfw-4.1-beta2"
diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi
index db33e17a28..e87e1fc270 100644
--- a/src/windows/installer/wix/site-local.wxi
+++ b/src/windows/installer/wix/site-local.wxi
@@ -52,7 +52,7 @@
     <?define Release?>
 
     <!-- Optional defines -->
-    <?define Beta="1"?> <!-- Numeric Beta identifier -->
+    <?define Beta="2"?> <!-- 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 4ca6e63dca..a9c6a1e388 100644
--- a/src/windows/kerberos.ver
+++ b/src/windows/kerberos.ver
@@ -52,7 +52,7 @@
 #define KRB5_MAJOR_RELEASE 4
 #define KRB5_MINOR_RELEASE 1
 #define KRB5_PATCHLEVEL 0
-#define KRB5_RELTAIL "beta1"
+#define KRB5_RELTAIL "beta2"
 /* #undef KRB5_RELDATE */
 
 #define KRB5_PRODUCTNAME_STR "MIT Kerberos for Windows"
diff --git a/src/windows/winlevel.h b/src/windows/winlevel.h
index f98f66cde0..03369dad64 100644
--- a/src/windows/winlevel.h
+++ b/src/windows/winlevel.h
@@ -29,4 +29,4 @@
  * updated for each alpha, beta, final release.   This will ensure
  * that file identifiers are unique
  */
-#define KRB5_BUILDLEVEL		1
+#define KRB5_BUILDLEVEL		2