From: Ian Jackson Date: Sun, 26 Oct 2014 14:58:21 +0000 (+0000) Subject: Merge branch 'master' of chiark:public-git/adns X-Git-Tag: adns-1.5.0~1 X-Git-Url: https://git.distorted.org.uk/~mdw/adns/commitdiff_plain/2403ca203cab4aaf9c84c49629851b6fc3bcf343?hp=495cc83f44b30ce37e1d2bb89c3b743ae86a20ba Merge branch 'master' of chiark:public-git/adns --- diff --git a/Makefile.in b/Makefile.in index 5ff85be..5d84617 100644 --- a/Makefile.in +++ b/Makefile.in @@ -24,7 +24,7 @@ include ./common.make # Remember to change ADNS_VERSION_STRING in client/client.h too, and # possibly library soname (MAJOR and MINOR in common.make.in). -DISTVERSION= 1.5.0~rc1~ +DISTVERSION= 1.5.0~rc2~ srcdir= @srcdir@ VPATH= @srcdir@ diff --git a/changelog b/changelog index 411645b..9b62b31 100644 --- a/changelog +++ b/changelog @@ -1,4 +1,10 @@ -adns (1.5.0~rc1~) UPSTREAM; urgency=low +adns (1.5.0~rc2~) UNRELEASED; urgency=low + + * WIP. + + -- Ian Jackson Sun, 26 Oct 2014 14:57:10 +0000 + +adns (1.5.0~rc1) UPSTREAM; urgency=low ABI/API changes: * Provide adns_qf_cname_strict flag, currently ignored because it's the @@ -28,7 +34,7 @@ adns (1.5.0~rc1~) UPSTREAM; urgency=low * More correctly and effectively work around bugs in make (Debian #4073, #756123) affecting regress. - -- Ian Jackson Sun, 26 Oct 2014 13:21:38 +0000 + -- Ian Jackson Sun, 26 Oct 2014 13:24:00 +0000 adns (1.5.0~rc0) UPSTREAM; urgency=low diff --git a/client/client.h b/client/client.h index 487693c..5be0b69 100644 --- a/client/client.h +++ b/client/client.h @@ -27,7 +27,7 @@ #ifndef CLIENT_H_INCLUDED #define CLIENT_H_INCLUDED -#define ADNS_VERSION_STRING "1.5.0~rc1~" +#define ADNS_VERSION_STRING "1.5.0~rc2~" #define COPYRIGHT_MESSAGE \ "Copyright (C) 1997-2000,2003,2006,2014 Ian Jackson\n" \