From: Kurt Zeilenga <kurt@openldap.org>
Date: Tue, 19 Jan 1999 23:49:37 +0000 (+0000)
Subject: Prepare files for import of -devel changes for 1.2.
X-Git-Tag: OPENLDAP_REL_ENG_1_2_BETA~44
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=dd99eb6b9a0d107ceca7a8175083aaf68086fb0c;p=thirdparty%2Fopenldap.git

Prepare files for import of -devel changes for 1.2.
---

diff --git a/CHANGES b/CHANGES
index 035b359259..0b7549afaf 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,5 +1,8 @@
 OpenLDAP Change Log
 
+Changes included in OpenLDAP 1.2
+	CVS Tag: OPENLDAP_REL_ENG_1_2
+
 Changes included in OpenLDAP 1.1.3
 	CVS Tag: OPENLDAP_REL_ENG_1_1_3
 	Updated LICENSE to allow open use of linked software
diff --git a/build/version b/build/version
index c6694bdb03..86658ea30a 100644
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-1.1.4-Engineering
+1.2.0-Engineering
diff --git a/configure b/configure
index 2900de93a8..b80aa5969f 100755
--- a/configure
+++ b/configure
@@ -756,7 +756,7 @@ fi
 
 PACKAGE=openldap
 
-VERSION=1.1
+VERSION=1.2
 
 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then
   { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; }
diff --git a/configure.in b/configure.in
index f3889aba04..8c240b3b6f 100644
--- a/configure.in
+++ b/configure.in
@@ -10,7 +10,7 @@ dnl
 dnl Configure.in for OpenLDAP
 AC_INIT(include/ldap.h)dnl
 AC_CONFIG_AUX_DIR(build)dnl
-AM_INIT_AUTOMAKE(openldap,[1.1], [no ac_define])dnl
+AM_INIT_AUTOMAKE(openldap,[1.2], [no ac_define])dnl
 
 dnl Do not use AutoConf 2.12; it produces a configuration script
 dnl that causes an "internal 2K buffer" error on HPUX when run