KfW release branch updates for kfw-4.0-beta1

In src/windows/kerberos.ver:
define KRB5_RELTAIL "beta1"
define KRB5_RELTAG "KFW 4.0 beta1"
In src/windows/installer/wix/site-local.wxi:
define Beta="1"

Signed-off-by: Kevin Wasserman <kevin.wasserman@painless-security.com>
[tlyu@mit.edu: squashed with a fixup commit]

diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi
index 80defd94a0ac99746760fbf1d3172f4456ee5812..fa1263ce6086f356bf859f4fc1b8cb1b216c9c01 100644 (file)
--- a/src/windows/installer/wix/site-local.wxi
+++ b/src/windows/installer/wix/site-local.wxi
@@ -60,7 +60,7 @@
     <?define DebugSyms?>
 
     <!-- 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 9e84d50ea804c6ae734f4b078feb69ef01838c81..6848a7a706fbf108a9de543d2d3114a2c6cbd9e1 100644 (file)
--- a/src/windows/kerberos.ver
+++ b/src/windows/kerberos.ver
@@ -52,8 +52,8 @@
 #define KRB5_MAJOR_RELEASE 4
 #define KRB5_MINOR_RELEASE 0
 #define KRB5_PATCHLEVEL 0
-#define KRB5_RELTAIL "prerelease"
+#define KRB5_RELTAIL "beta1"
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "trunk"
+#define KRB5_RELTAG "KFW 4.0 beta1"
 
 #define KRB5_PRODUCTNAME_STR "MIT Kerberos for Windows"