make openafs 1.6.4

The wrong commit was tagged for the 1.6.3 release by accident.
Update the version strings to 1.6.4, and adapt the release notes.

Change-Id: I0c4f8e796a1017aebaaf6c219fd12e1547ad9319
Reviewed-on: http://gerrit.openafs.org/9983
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@your-file-system.com>

diff --git a/NEWS b/NEWS
index 8c7a812314a39612cf1cc7b2f5f23c4e4ddd7de8..e1f5d9ba34932580a521daf1a7050c7642a464c0 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
                        User-Visible OpenAFS Changes
 
-OpenAFS 1.6.3
+OpenAFS 1.6.4
 
 All platforms
 
@@ -87,6 +87,10 @@ OpenBSD
 
     * Improved support for OpenBSD 4.9 to 5.3
 
+OpenAFS 1.6.3
+
+  This release number had to be skipped for technical reasons.
+
 OpenAFS 1.6.2.1
 
   Linux clients

diff --git a/configure-libafs.ac b/configure-libafs.ac
index e1292d805932bd5d330cecf41a2594b8fcf6e7ce..e9ba4ca8abdce3e468b771f1fc7dd0dee61c5d1c 100644 (file)
--- a/configure-libafs.ac
+++ b/configure-libafs.ac
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR(src/libafs/Makefile.common.in)
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADER(src/config/afsconfig.h)
-MACOS_VERSION=1.6.3
+MACOS_VERSION=1.6.4
 
 AC_SUBST(MACOS_VERSION)
 

diff --git a/configure.ac b/configure.ac
index aa9f26ce1dec489a593a90976ab544c0a7505fb6..42dec336cec15292f184d65c0955ba6016b8f8be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -5,8 +5,8 @@ AC_CONFIG_SRCDIR([src/config/stds.h])
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_HEADER(src/config/afsconfig.h)
-MACOS_VERSION=1.6.3
-LINUX_PKGVER=1.6.3
+MACOS_VERSION=1.6.4
+LINUX_PKGVER=1.6.4
 
 dnl Debian wants the release candidate version in the main upstream version,
 dnl and wants ~ before it.

diff --git a/src/config/NTMakefile.amd64_w2k b/src/config/NTMakefile.amd64_w2k
index 262bcc986068e46c643a4a1469451ba04de4362d..38edba199d531632d1799bafee1ee071bae09e36 100644 (file)
--- a/src/config/NTMakefile.amd64_w2k
+++ b/src/config/NTMakefile.amd64_w2k
@@ -90,7 +90,7 @@ AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=6
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=0303
+AFSPRODUCT_VER_PATCH=0400
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0

diff --git a/src/config/NTMakefile.i386_nt40 b/src/config/NTMakefile.i386_nt40
index 0e7552a840d5e2c8ce264bc5cca84b707a4e6422..a85198c9f2fa1c323e6f623dec2f83f686cf27d1 100644 (file)
--- a/src/config/NTMakefile.i386_nt40
+++ b/src/config/NTMakefile.i386_nt40
@@ -90,7 +90,7 @@ AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=6
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=0303
+AFSPRODUCT_VER_PATCH=0400
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0

diff --git a/src/config/NTMakefile.i386_w2k b/src/config/NTMakefile.i386_w2k
index 89a0e4e127e7f9cfd326b6556e1304ac79b6b838..309bb638180a93a9f5240899a426be7e29c56486 100644 (file)
--- a/src/config/NTMakefile.i386_w2k
+++ b/src/config/NTMakefile.i386_w2k
@@ -94,7 +94,7 @@ AFSPRODUCT_VER_MAJOR=1
 AFSPRODUCT_VER_MINOR=6
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_PATCH)
-AFSPRODUCT_VER_PATCH=0303
+AFSPRODUCT_VER_PATCH=0400
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0