From 1a36904673fdce23f630fbf601a07923fae372c3 Mon Sep 17 00:00:00 2001 From: Stephan Wiesand Date: Wed, 13 Jul 2016 14:25:58 +0200 Subject: [PATCH] Make OpenAFS 1.6.18.2 Update configure version strings for 1.6.18.2. Note that macos kext can be of form XXXX.YY[.ZZ[(d|a|b|fc)NNN]] where d dev, a alpha, b beta, f final candidate so we have no way to represent 1.6.18.2. Switch to 1.6.19 dev 2 for macos. Change-Id: I3bf417d8d304bb83a024b934ede9748ca15aa588 Reviewed-on: https://gerrit.openafs.org/12327 Tested-by: BuildBot Reviewed-by: Stephan Wiesand --- 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 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/configure-libafs.ac b/configure-libafs.ac index 87112ed437..349b60c315 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.19d1 +MACOS_VERSION=1.6.19d2 AC_SUBST(MACOS_VERSION) diff --git a/configure.ac b/configure.ac index 49d3bbe4b7..138077b77c 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.19d1 -LINUX_PKGVER=1.6.18.1 +MACOS_VERSION=1.6.19d2 +LINUX_PKGVER=1.6.18.2 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 e146f6434a..4ba57c2ff6 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=1802 +AFSPRODUCT_VER_PATCH=1803 !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 1c4f8a7018..b7bbe6c673 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=1802 +AFSPRODUCT_VER_PATCH=1803 !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 573a938a62..a72bb66aac 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=1802 +AFSPRODUCT_VER_PATCH=1803 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0