From: Greg Hudson <ghudson@mit.edu>
Date: Tue, 2 Apr 2019 15:22:06 +0000 (-0400)
Subject: Updates for kfw-4.2-beta1-mit
X-Git-Tag: kfw-4.2-beta1-mit
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e96401ca212302e54b15ba9be9f05e1656c64a4d;p=thirdparty%2Fkrb5.git

Updates for kfw-4.2-beta1-mit
---

diff --git a/src/patchlevel.h b/src/patchlevel.h
index 8afd2d1aaf..fb8e6913c3 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -52,6 +52,6 @@
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 17
 #define KRB5_PATCHLEVEL 0
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_RELTAIL "kfw-4.2-beta1-mit"
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.17"
+#define KRB5_RELTAG "kfw-4.2-beta1-mit"
diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi
index 12a32dbf5c..818e6ffd20 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 -->
 
@@ -68,7 +68,7 @@
 
     <?ifndef VersionMajor?>
         <?define VersionMajor="4"?>
-        <?define VersionMinor="1"?>
+        <?define VersionMinor="2"?>
         <?define VersionPatch="0"?>
     <?else?>
         <?if Not ($(var.VersionMinor) And $(var.VersionPatch))?>
diff --git a/src/windows/kerberos.ver b/src/windows/kerberos.ver
index e6b8eca288..14d1b18062 100644
--- a/src/windows/kerberos.ver
+++ b/src/windows/kerberos.ver
@@ -50,10 +50,9 @@
  * organization.
  */
 #define KRB5_MAJOR_RELEASE 4
-#define KRB5_MINOR_RELEASE 1
+#define KRB5_MINOR_RELEASE 2
 #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"