From: Ian Jackson <ijackson@chiark.greenend.org.uk>
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=c6545b9769b4f451d19c106de8e0c799ae174bb1

Merge branch 'master' of chiark:public-git/adns
---

diff --git a/RELEASE-CHECKLIST b/RELEASE-CHECKLIST
index d2fb527..3ca69a9 100755
--- a/RELEASE-CHECKLIST
+++ b/RELEASE-CHECKLIST
@@ -7,12 +7,18 @@
 #  * Maybe update MAJOR and/or MINOR in common.make.in
 #  * Update DISTVERSION in Makefile.in
 #  * Update ADNS_VERSION_STRING in client/client.h
+#  * Update version in ./changelog
+#  * Commit the result
 #
 #  * Run this script
 #      ./RELEASE-CHECKLIST [--real] <version>
 #
 #  * On chiark, maybe, replace ~ian/public-html/adns/current
-#    with symlink to web-$(version) (as directed by script)
+#    with symlink to web-$(version)
+#
+#  * On chiark, maybe, replace docs link (as directed by script)
+#
+#  * If not an rc release, put files on ftp.gnu.org
 #
 #  * Send release announcement (use last one as template)
 #
@@ -45,8 +51,8 @@ wx () { if $real; then x "$@"; else echo "WOULD: $*"; fi; }
 
 x git clean -xdff
 x ./configure
-x make -j4
-x make check
+x make -j6
+x make check -j6
 x make dist
 rm -rf web
 x make web-install