Update for release

diff --git a/CHANGES b/CHANGES
index a133afe9d86aaa34af9ce6418f5dac72fe0bd820..93d44e201d6926ff94224b07f23039782f8993cf 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,11 +1,11 @@
 OpenLDAP 2.0 Change Log
 
-OpenLDAP 2.0.15 Engineering
+OpenLDAP 2.0.15 Release
        Fixed -lldap TLS external handling
        Fixed -lldap ldaps:// no host bug
        Fixed slapd Statslog bug
-       Fixed slapd oidm support
-       Added -lldap oidm support
+       Fixed slapd oidm support (ITS#1258)
+       Added -lldap oidm support (ITS#1213)
        Added slapd supportedFeatures support
        Removed lint
        Build environment

diff --git a/build/top.mk b/build/top.mk
index 106bfe584ffef8554960208cb991ffdc9060c300..f7539a63daf5cfcc479a2f2fe9297db1b2288b01 100644 (file)
--- a/build/top.mk
+++ b/build/top.mk
@@ -56,7 +56,7 @@ MKDEP_CFLAGS = @OL_MKDEP_FLAGS@
 MKVERSION = $(top_srcdir)/build/mkversion -v "$(VERSION)"
 
 LIBTOOL = @LIBTOOL@
-LIBVERSION = 2:9:0
+LIBVERSION = 2:10:0
 LTVERSION = -version-info $(LIBVERSION)
 #We don't use our own shared libraries (yet)
 #LTLINK  = $(LIBTOOL) --mode=link $(CC) -rpath $(libdir) \

diff --git a/build/version b/build/version
index cf37e82a400916562c710dce17f1ce74c8686d93..df2acd340d3efd60165dc784c7d9176447d820af 100644 (file)
--- a/build/version
+++ b/build/version
@@ -1 +1 @@
-2.0.15-Engineering
+2.0.15-Release

diff --git a/include/ldap.h b/include/ldap.h
index 329aa90c5345b50cca27f59544d70f20d9a68735..769258b20a43249f440a8d52750645b5527a0f9c 100644 (file)
--- a/include/ldap.h
+++ b/include/ldap.h
@@ -50,7 +50,7 @@ LDAP_BEGIN_DECL
  *     2.0.0  -> 20000
  *     2.3.16 -> 20316
  */
-#define LDAP_VENDOR_VERSION    20014
+#define LDAP_VENDOR_VERSION    20015
 
 /* OpenLDAP API Features */
 #define LDAP_API_FEATURE_X_OPENLDAP LDAP_VENDOR_VERSION