krb5 commit [krb5-1.10]: Version info for KfW 4.0

[Tom Yu]

https://github.com/krb5/krb5/commit/a5b425458e488a0092e5a589ce0eec44770e20e6
commit a5b425458e488a0092e5a589ce0eec44770e20e6
Author: Ben Kaduk <kaduk at mit.edu>
Date:   Wed Sep 26 15:56:25 2012 -0400

    Version info for KfW 4.0
    
    Switch away from beta to release versioning in site-local.wix,
    and replace the beta tag with release.
    
    Increment the buildlevel, as always.
    
    Update patchlevel.h to indicate this is a KfW build.

 src/patchlevel.h                         |    4 ++--
 src/windows/installer/wix/site-local.wxi |    5 +++--
 src/windows/kerberos.ver                 |    4 ++--
 src/windows/winlevel.h                   |    2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/patchlevel.h b/src/patchlevel.h
index d8bbcf9..8a52b28 100644
--- a/src/patchlevel.h
+++ b/src/patchlevel.h
@@ -52,6 +52,6 @@
 #define KRB5_MAJOR_RELEASE 1
 #define KRB5_MINOR_RELEASE 10
 #define KRB5_PATCHLEVEL 3
-#define KRB5_RELTAIL "postrelease"
+#define KRB5_RELTAIL "kfw-4.0-final"
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.10"
+#define KRB5_RELTAG "kfw-4.0-final"
diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi
index dce2c36..f1ee983 100644
--- a/src/windows/installer/wix/site-local.wxi
+++ b/src/windows/installer/wix/site-local.wxi
@@ -49,10 +49,11 @@
 
     <!-- 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="10"?> <!-- Numeric Beta identifier -->
+    <!-- Numeric Beta identifier -->
+    <!--<?define Beta="1"?> -->
     <!-- <?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 0e2142f..8dd75bc 100644
--- 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 "beta10"
+/* #undef KRB5_RELTAIL */
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "KFW 4.0 beta10"
+#define KRB5_RELTAG "kfw-4.0-final"
 
 #define KRB5_PRODUCTNAME_STR "MIT Kerberos for Windows"
diff --git a/src/windows/winlevel.h b/src/windows/winlevel.h
index 03f8fea..c62be88 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		3
+#define KRB5_BUILDLEVEL		6