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.

diff --git a/src/patchlevel.h b/src/patchlevel.h
index d8bbcf927011a7cfdb7d39449a0d60ac78dbc76b..8a52b288f08b8dd598274c25b4933cff46a9d8db 100644 (file)
--- 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 dce2c361109021449f35263947a86559729c43ce..f1ee98318253b308df9b0bb9e113aee8a940454d 100644 (file)
--- 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 0e2142f39d0d9e7d3717e3193e43691f53859831..8dd75bc100342ed6cb6ac8663bec05a981ab2378 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 "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 03f8fea7633a5f0a950f60c511b22c8441399955..c62be8821974392b49849552ac5231d6c0c9722d 100644 (file)
--- 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