From 3994c23187d42164a1f3d3b5ddedd59525417864 Mon Sep 17 00:00:00 2001
From: Jeffrey Altman <jaltman@your-file-system.com>
Date: Wed, 28 Oct 2015 09:06:44 -0400
Subject: [PATCH] VERSION: 1.6.15

Update configure version strings for 1.6.15.

Change-Id: I1b730216b982b7c327730b1d0cf4061666f0fa8d
---
 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 5698b6b32b..9b5bbfd153 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.15d1
+MACOS_VERSION=1.6.15
 
 AC_SUBST(MACOS_VERSION)
 
diff --git a/configure.ac b/configure.ac
index 7ce054183f..36c933753f 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.15d1
-LINUX_PKGVER=1.6.14.1
+MACOS_VERSION=1.6.15
+LINUX_PKGVER=1.6.15
 
 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 8584018cf4..4c052196a9 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=1401
+AFSPRODUCT_VER_PATCH=1500
 !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 2863e6af4b..109fefc272 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=1401
+AFSPRODUCT_VER_PATCH=1500
 !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 fba1a0975e..a84f4dcbd9 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=1401
+AFSPRODUCT_VER_PATCH=1500
 !ENDIF
 !IF !DEFINED(AFSPRODUCT_VER_BUILD)
 AFSPRODUCT_VER_BUILD=0