Update version info.

diff --git a/ANNOUNCEMENT b/ANNOUNCEMENT
index 9aa33e932473e43d20e1efb42029ef91abd63f76..311d5518ba1e1fc109bf092a26972dceeb030d15 100644 (file)
--- a/ANNOUNCEMENT
+++ b/ANNOUNCEMENT
@@ -1,9 +1,9 @@
        A N N O U N C E M E N T
 
-       OpenLDAP 1.1
+       OpenLDAP 1.2
 
        The OpenLDAP Project is pleased to announce the availability
-       of OpenLDAP release 1.1, a suite of the Lightweight Weight
+       of OpenLDAP release 1.2, 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,6 +33,11 @@
        - 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/build/version b/build/version
index c6694bdb0386297ca257d3a355b74169ac47f9b7..86658ea30ae414760b49dc3754858f2fc6f5f772 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-1.1.4-Engineering
+1.2.0-Engineering

diff --git a/configure b/configure
index 2900de93a802f670e002ddf58e0ca3dba81e5763..b80aa5969fbc35f75207f58ea3e026c03e2c7ceb 100755 (executable)
--- 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 f3889aba04083bbbddf53958c4bd1dae4b2365ee..8c240b3b6ff89c36786b1f85df3238b11199efb2 100644 (file)
--- 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