tag 1.4.15, trunk is now 1.4.16 development.

git-svn-id: file:///svn/unbound/trunk@2595 be551aaa-1e26-0410-a405-d3ace91eadb9

diff --git a/configure b/configure
index 0c21caf1c4a0d6b1f00d38ce669b2609cc512bc5..3912a05c5143c2b73e6325285f158f32bce76fca 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for unbound 1.4.15.
+# Generated by GNU Autoconf 2.68 for unbound 1.4.16.
 #
 # Report bugs to <unbound-bugs@nlnetlabs.nl>.
 #
@@ -570,8 +570,8 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='unbound'
 PACKAGE_TARNAME='unbound'
-PACKAGE_VERSION='1.4.15'
-PACKAGE_STRING='unbound 1.4.15'
+PACKAGE_VERSION='1.4.16'
+PACKAGE_STRING='unbound 1.4.16'
 PACKAGE_BUGREPORT='unbound-bugs@nlnetlabs.nl'
 PACKAGE_URL=''
 
@@ -1352,7 +1352,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures unbound 1.4.15 to adapt to many kinds of systems.
+\`configure' configures unbound 1.4.16 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1418,7 +1418,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of unbound 1.4.15:";;
+     short | recursive ) echo "Configuration of unbound 1.4.16:";;
    esac
   cat <<\_ACEOF
 
@@ -1583,7 +1583,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-unbound configure 1.4.15
+unbound configure 1.4.16
 generated by GNU Autoconf 2.68
 
 Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2052,7 +2052,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by unbound $as_me 1.4.15, which was
+It was created by unbound $as_me 1.4.16, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   $ $0 $@
@@ -2402,7 +2402,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 LIBUNBOUND_CURRENT=3
-LIBUNBOUND_REVISION=0
+LIBUNBOUND_REVISION=1
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -2434,6 +2434,7 @@ LIBUNBOUND_AGE=1
 # and 1.4.13p1 and 1.4.13.p2
 # 1.4.14 had 2:14:0
 # 1.4.15 had 3:0:1 # adds ub_version()
+# 1.4.16 had 3:1:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary
@@ -18347,7 +18348,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by unbound $as_me 1.4.15, which was
+This file was extended by unbound $as_me 1.4.16, which was
 generated by GNU Autoconf 2.68.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -18413,7 +18414,7 @@ _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-unbound config.status 1.4.15
+unbound config.status 1.4.16
 configured by $0, generated by GNU Autoconf 2.68,
   with options \\"\$ac_cs_config\\"
 

diff --git a/configure.ac b/configure.ac
index 26fa2848f6c063d5cd2372e084614355dfbd401c..285a63b1038ab1612a4d265c213024d55f0f6c50 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -6,10 +6,10 @@ sinclude(acx_pthread.m4)
 sinclude(acx_python.m4)
 sinclude(ac_pkg_swig.m4)
 
-AC_INIT(unbound, 1.4.15, unbound-bugs@nlnetlabs.nl, unbound)
+AC_INIT(unbound, 1.4.16, unbound-bugs@nlnetlabs.nl, unbound)
 
 LIBUNBOUND_CURRENT=3
-LIBUNBOUND_REVISION=0
+LIBUNBOUND_REVISION=1
 LIBUNBOUND_AGE=1
 # 1.0.0 had 0:12:0
 # 1.0.1 had 0:13:0
@@ -41,6 +41,7 @@ LIBUNBOUND_AGE=1
 # and 1.4.13p1 and 1.4.13.p2
 # 1.4.14 had 2:14:0
 # 1.4.15 had 3:0:1 # adds ub_version()
+# 1.4.16 had 3:1:1
 
 #   Current  -- the number of the binary API that we're implementing
 #   Revision -- which iteration of the implementation of the binary

diff --git a/doc/Changelog b/doc/Changelog
index 86e4bb86f1eec08302839a739b39b1addd55ad9a..52f6b7f1c23a7789029321844ed12a6829fb5f37 100644 (file)
--- a/doc/Changelog
+++ b/doc/Changelog
@@ -1,3 +1,8 @@
+26 January 2012: Wouter
+       - Tag 1.4.15 (same as 1.4.15rc1), for 1.4.15 release.
+       - trunk 1.4.16; includes changes memset testcode, #424 openindiana,
+         and keyfile write fixup.
+
 23 January 2012: Wouter
        - Fix memset in test code.