From 1db8a1c134ed64730e6f6719caf2ba6c689ae31a Mon Sep 17 00:00:00 2001 From: Stephan Wiesand Date: Wed, 1 Apr 2015 15:52:46 +0200 Subject: [PATCH] Make OpenAFS 1.6.11.1 Update configure version strings for 1.6.11.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.11.1. Switch to 1.6.12 dev 1 for macos. Change-Id: Id8975b3d0dfa17e5bc9357b2fb8090bcbd497a6e Reviewed-on: http://gerrit.openafs.org/11819 Reviewed-by: Daria Brashear 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 24f3baf5da..3f9a6feddb 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.11 +MACOS_VERSION=1.6.12d1 AC_SUBST(MACOS_VERSION) diff --git a/configure.ac b/configure.ac index a4cf7f6f37..6672c4e4ee 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.11 -LINUX_PKGVER=1.6.11 +MACOS_VERSION=1.6.12d1 +LINUX_PKGVER=1.6.11.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 168ab1655a..f4ad44f9f5 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=1102 +AFSPRODUCT_VER_PATCH=1103 !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 a71153219b..a070d025c5 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=1102 +AFSPRODUCT_VER_PATCH=1103 !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 fc1b68d732..791e6dc3ad 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=1102 +AFSPRODUCT_VER_PATCH=1103 !ENDIF !IF !DEFINED(AFSPRODUCT_VER_BUILD) AFSPRODUCT_VER_BUILD=0