Make OpenAFS 1.6.18

Update version strings and finalize NEWS for release 1.6.18 .

Change-Id: I526f8964913d0cd869bfabad74036328e26ed5c3
Reviewed-on: https://gerrit.openafs.org/12261
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Michael Meffie <mmeffie@sinenomine.net>
Reviewed-by: Stephan Wiesand <stephan.wiesand@desy.de>

diff --git a/NEWS b/NEWS
index 2367b7d0c1c51b5cf192cb1ebeb41d8cf0cf724a..743f040dd5d1bf72c19450778f1e06342ca11478 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,6 @@
                        User-Visible OpenAFS Changes
 
-OpenAFS 1.6.18 (in progress)
+OpenAFS 1.6.18
 
   All platforms
 

diff --git a/configure-libafs.ac b/configure-libafs.ac
index 582c984a14722e2b3522b6b1c7797d1192ce45a4..d3cd695b17715bb3750e0c73104ba396eef57ce8 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.18fc1
+MACOS_VERSION=1.6.18
 
 AC_SUBST(MACOS_VERSION)
 

diff --git a/configure.ac b/configure.ac
index 62ee137712032d7b0deb58ff95080fee3c1a2fb1..25555d6f366bb248952fa50f9dcef8d618e64e4e 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.18fc1
-LINUX_PKGVER=1.6.18pre1
+MACOS_VERSION=1.6.18
+LINUX_PKGVER=1.6.18
 
 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 e2f308592678d48f6122d3a8dda23049fc19d797..f612f89079d88308a3f7585268da150f1781497a 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=1800
+AFSPRODUCT_VER_PATCH=1801
 !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 2bfa5521de7f6138078942eb19de521d150a40f4..86a6216e5c9b87f6d45b94c829b782c1989982cd 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=1800
+AFSPRODUCT_VER_PATCH=1801
 !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 5a42d5c0b49ac8cfbe45118908ddbff49279260c..a399b86f65590cded30744b121947452d7031730 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=1800
+AFSPRODUCT_VER_PATCH=1801
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0