Ready for KfW 4.0.1 beta 1

Bump versions where appropriate, and drop buildlevel back to zero
for the new version.

While here, remove KRB5_RELTAG and KRB5_RELDATE from
src/windows/kerberos.ver as they are unused and merely serve
to cause confusion with the values in src/patchlevel.h.

[tlyu@mit.edu: update patchlevel.h too]

diff --git a/src/patchlevel.h b/src/patchlevel.h
index d8bbcf927011a7cfdb7d39449a0d60ac78dbc76b..bb48c2d48c7cdbbf224622dc94a1177d44d2a952 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.1-beta1"
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.10"
+#define KRB5_RELTAG "kfw-4.0.1-beta1"

diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi
index f1ee98318253b308df9b0bb9e113aee8a940454d..e881bd548c3edcf1a4c20057520b2ad1f46049ce 100644 (file)
--- a/src/windows/installer/wix/site-local.wxi
+++ b/src/windows/installer/wix/site-local.wxi
@@ -49,11 +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 -->
-    <!-- Numeric Beta identifier -->
-    <!--<?define Beta="1"?> -->
+    <?define Beta="1"?> <!-- Numeric Beta identifier -->
     <!-- <?define OldHelp?> --> <!-- Specifies the use of the old leash32.hlp file
                            instead of the new leash32.chm file -->
 
@@ -70,7 +69,7 @@
     <?ifndef VersionMajor?>
         <?define VersionMajor="4"?>
         <?define VersionMinor="0"?>
-        <?define VersionPatch="0"?>
+        <?define VersionPatch="1"?>
     <?else?>
         <?if Not ($(var.VersionMinor) And $(var.VersionPatch))?>
             <?error VersionMajor, VersionMinor and VersionPatch should be specified together?>

diff --git a/src/windows/kerberos.ver b/src/windows/kerberos.ver
index d53fa90666bfdf8480f659a6f8ac6071f285e038..3e6ca7bdac3fef18d64726e17e47fa4ea9910e7a 100644 (file)
--- a/src/windows/kerberos.ver
+++ b/src/windows/kerberos.ver
@@ -34,10 +34,6 @@
  *
  * Immediately following a final release, the release version numbers
  * will be incremented, and KRB5_RELTAIL will revert to "prerelease".
- *
- * KRB5_RELTAG contains the CVS tag name corresponding to the release.
- * KRB5_RELDATE identifies the date of the release.  They should
- * normally be undefined for checked-in code.
  */
 
 /*
@@ -51,9 +47,7 @@
  */
 #define KRB5_MAJOR_RELEASE 4
 #define KRB5_MINOR_RELEASE 0
-#define KRB5_PATCHLEVEL 0
-#define KRB5_RELTAIL "postrelease"
-/* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.10"
+#define KRB5_PATCHLEVEL 1
+#define KRB5_RELTAIL "beta1"
 
 #define KRB5_PRODUCTNAME_STR "MIT Kerberos for Windows"

diff --git a/src/windows/winlevel.h b/src/windows/winlevel.h
index 09a8edab8495eec3388b7efbab6cb6d3003303d6..13ad8fcf5b2b95f04f43f8d1145211b75cd04060 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                7
+#define KRB5_BUILDLEVEL                0