From bf8c714465a81b0e57c0ce2b95a5cc273e4a676a Mon Sep 17 00:00:00 2001 From: Stephan Wiesand Date: Wed, 2 Oct 2013 11:14:37 +0200 Subject: [PATCH] Make OpenAFS 1.6.5.1 Update configure version strings for 1.6.5.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.5.1. Switch to 1.6.6 dev 1 for macos. Change-Id: I44a34f5c8ac3f3518da51e179db05723d3ad754a Reviewed-on: http://gerrit.openafs.org/10317 Reviewed-by: Andrew Deason Reviewed-by: Jeffrey Altman Reviewed-by: Michael Meffie Reviewed-by: Stephan Wiesand Tested-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 4ca0437e0..d74d62da1 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.5 +MACOS_VERSION=1.6.6d1 AC_SUBST(MACOS_VERSION) diff --git a/configure.ac b/configure.ac index da1ff5e03..dfaf765cc 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.5 -LINUX_PKGVER=1.6.5 +MACOS_VERSION=1.6.6d1 +LINUX_PKGVER=1.6.5.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 4fedfd8c4..490ce3e26 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=0500 +AFSPRODUCT_VER_PATCH=0501 !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 c96532e34..9eca4830a 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=0500 +AFSPRODUCT_VER_PATCH=0501 !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 814a3e11d..a30932211 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=0500 +AFSPRODUCT_VER_PATCH=0501 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0 -- 2.39.5