From: Stephan Wiesand Date: Mon, 13 Jun 2016 08:51:13 +0000 (+0200) Subject: Make OpenAFS 1.6.18.1 X-Git-Tag: upstream/1.6.18.1^2 X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=62c3882ba4c48c237b07c569dc59510a517081ad;p=packages%2Fo%2Fopenafs.git Make OpenAFS 1.6.18.1 Update configure version strings for 1.6.18.1. 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.1. Switch to 1.6.19 dev 1 for macos. Change-Id: Ic696a691a693ac048ae6d4c6a8ac7810992d585a Reviewed-on: https://gerrit.openafs.org/12303 Tested-by: BuildBot Reviewed-by: Stephan Wiesand --- diff --git a/configure-libafs.ac b/configure-libafs.ac index d3cd695b1..87112ed43 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.18 +MACOS_VERSION=1.6.19d1 AC_SUBST(MACOS_VERSION) diff --git a/configure.ac b/configure.ac index 25555d6f3..49d3bbe4b 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.18 -LINUX_PKGVER=1.6.18 +MACOS_VERSION=1.6.19d1 +LINUX_PKGVER=1.6.18.1 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 f612f8907..e146f6434 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=1801 +AFSPRODUCT_VER_PATCH=1802 !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 86a6216e5..1c4f8a701 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=1801 +AFSPRODUCT_VER_PATCH=1802 !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 a399b86f6..573a938a6 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=1801 +AFSPRODUCT_VER_PATCH=1802 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0