From a854188922f29fac15ad17999732c45b7e6818bf Mon Sep 17 00:00:00 2001 From: Stephan Wiesand Date: Wed, 27 Apr 2016 15:18:48 +0200 Subject: [PATCH] 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 Reviewed-by: Michael Meffie Reviewed-by: Stephan Wiesand --- NEWS | 2 +- configure-libafs.ac | 2 +- configure.ac | 4 ++-- src/config/NTMakefile.amd64_w2k | 2 +- src/config/NTMakefile.i386_nt40 | 2 +- src/config/NTMakefile.i386_w2k | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/NEWS b/NEWS index 2367b7d0c..743f040dd 100644 --- 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 582c984a1..d3cd695b1 100644 --- 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 62ee13771..25555d6f3 100644 --- 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 e2f308592..f612f8907 100644 --- 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 2bfa5521d..86a6216e5 100644 --- 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 5a42d5c0b..a399b86f6 100644 --- 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 -- 2.39.5