From: Kurt Zeilenga <kurt@openldap.org>
Date: Wed, 20 Jan 1999 04:17:41 +0000 (+0000)
Subject: Back out previous changes that were meant for rel eng 1.2.
X-Git-Tag: OPENLDAP_REL_ENG_1_1_4~18
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4729d0c1c27ffdf48086f816a0b993226d7a6f73;p=thirdparty%2Fopenldap.git

Back out previous changes that were meant for rel eng 1.2.
---

diff --git a/ANNOUNCEMENT b/ANNOUNCEMENT
index 311d5518ba..9aa33e9324 100644
--- a/ANNOUNCEMENT
+++ b/ANNOUNCEMENT
@@ -1,9 +1,9 @@
 	A N N O U N C E M E N T
 
-	OpenLDAP 1.2
+	OpenLDAP 1.1
 
 	The OpenLDAP Project is pleased to announce the availability
-	of OpenLDAP release 1.2, a suite of the Lightweight Weight
+	of OpenLDAP release 1.1, a suite of the Lightweight Weight
 	Directory Protocol servers, clients, utilities, and development tools.
 
 	OpenLDAP is derived from University of Michigan LDAP release 3.3.
@@ -33,11 +33,6 @@
 	- whois++d - a WHOIS++-to-LDAP gateway
 
 CHANGES
-	Changes from OpenLDAP 1.1
-	- ldappasswd tool, password prompting, salted MD5/SHA1 support
-	- platforms updates, and
-	- numerous bug fixes and build changes.
-
 	Changes from OpenLDAP 1.0
 	- improved build environment with dynamic library support,
 	- externally configurable client library support: ldap.conf(5),
diff --git a/configure b/configure
index b80aa5969f..2900de93a8 100755
--- a/configure
+++ b/configure
@@ -756,7 +756,7 @@ fi
 
 PACKAGE=openldap
 
-VERSION=1.2
+VERSION=1.1
 
 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 8c240b3b6f..f3889aba04 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.2], [no ac_define])dnl
+AM_INIT_AUTOMAKE(openldap,[1.1], [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