From: Ben Kaduk <kaduk@mit.edu>
Date: Fri, 7 Dec 2012 16:04:53 +0000 (-0500)
Subject: Ready for KfW 4.0.1
X-Git-Tag: kfw-4.0.1-final
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=beb60be5ff27c20690d6371424400c90b1e4418a;p=thirdparty%2Fkrb5.git

Ready for KfW 4.0.1

Release builds, not beta.  Update reltag/reltail where
appropriate, and bump the buildlevel.
---

diff --git a/src/patchlevel.h b/src/patchlevel.h
index d8bbcf9270..c5e76d1189 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.1-final"
 /* #undef KRB5_RELDATE */
-#define KRB5_RELTAG "krb5-1.10"
+#define KRB5_RELTAG "kfw-4.0.1-final"
diff --git a/src/windows/installer/wix/site-local.wxi b/src/windows/installer/wix/site-local.wxi
index e881bd548c..21678efe61 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="1"?> <!-- 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 3e6ca7bdac..489e8a988a 100644
--- a/src/windows/kerberos.ver
+++ b/src/windows/kerberos.ver
@@ -48,6 +48,6 @@
 #define KRB5_MAJOR_RELEASE 4
 #define KRB5_MINOR_RELEASE 0
 #define KRB5_PATCHLEVEL 1
-#define KRB5_RELTAIL "beta1"
+/* #undef KRB5_RELTAIL */
 
 #define KRB5_PRODUCTNAME_STR "MIT Kerberos for Windows"
diff --git a/src/windows/winlevel.h b/src/windows/winlevel.h
index 13ad8fcf5b..f98f66cde0 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		0
+#define KRB5_BUILDLEVEL		1