Release v5.

Signed-off-by: Gary V. Vaughan <gary@gnu.org>

.travis.yml

@@ -6,14 +6,14 @@ env:
     - PACKAGE=slingshot
     - ROCKSPEC=$PACKAGE-git-1.rockspec
     - LUAROCKS_CONFIG=build-aux/luarocks-config.lua
-    - LUAROCKS_BASE=luarocks-2.0.13
+    - LUAROCKS_BASE=luarocks-2.1.1
     - LUAROCKS="$LUA $HOME/bin/luarocks"
     - GENDOC=luarocks/bin/
     - SPECL=bin/specl
   matrix:
-    - LUA=lua5.1             LUA_INCDIR=/usr/include/lua5.1
-    - LUA=lua5.2             LUA_INCDIR=/usr/include/lua5.2
-    - LUA=luajit-2.0.0-beta9 LUA_INCDIR=/usr/include/luajit-2.0
+    - LUA=lua5.1             LUA_INCDIR=/usr/include/lua5.1     LUA_SUFFIX=5.1
+    - LUA=lua5.2             LUA_INCDIR=/usr/include/lua5.2     LUA_SUFFIX=5.2
+    - LUA=luajit-2.0.0-beta9 LUA_INCDIR=/usr/include/luajit-2.0 LUA_SUFFIX=5.1
 
 # Tool setup.
 install:
@@ -24,6 +24,9 @@ install:
   - sudo apt-get install liblua5.1-dev
   - sudo apt-get install lua5.2
   - sudo apt-get install liblua5.2-dev
+  # Put back the links for libyaml, which missing on recent Travis VMs
+  - test -f /usr/lib/libyaml.so ||
+    sudo find /usr/lib -name 'libyaml*' -exec ln -s {} /usr/lib \;
   # Luadoc and Ldoc work best on Travis with Lua 5.1.
   # sudo apt-get install luarocks
   # sudo luarocks install
@@ -35,8 +38,8 @@ install:
   - tar zxvpf $LUAROCKS_BASE.tar.gz
   - cd $LUAROCKS_BASE
   - ./configure
-    --prefix=$HOME --lua-version=5.1 --lua-suffix=5.1
-    --with-lua-include="/usr/include/lua5.1"
+    --prefix=$HOME --lua-version=$LUA_SUFFIX --lua-suffix=$LUA_SUFFIX
+    --with-lua-include=$LUA_INCDIR
   - make all install
   - cd ..
 

ChangeLog

@@ -1,4 +1,114 @@
-2013-08-29  Gary V. Vaughan  <gary@gnu.org>
+2013-12-08  Gary V. Vaughan  <gary@gnu.org>
+
+	Release version 5
+	* NEWS: Record release date.
+
+	syntax-check: exclude gnupload from some sanity checks.
+	* build-aux/sanity-cfg.mk (EXTRA_DIST): Add build-aux/sanity-cfg.mk.
+	Exclude gnupload from GPL_version and two_space_separator_in_usage
+	checks.
+
+	build-aux: sync gnupload with gnulib upstream.
+	* build-aux/gnupload: Update from gnulib.
+
+	release: remove disembodied "|| exit 1" from no-submodule-changes.
+	* build-aux/release.mk (no-submodule-changes): Even though the
+	unchanged syntax still matches what's in upstream gnulib... I
+	can't parse it, and neither can my shell.  Removing the errant
+	'|| exit 1' clause fixes the error message for me (/bin/bash:
+	 -c: line 1: syntax error: unexpected end of file).
+	* NEWS: Update.
+
+	maint: Update NEWS.
+	* NEWS: Update.
+
+	travis: update to luarocks-2.1.1.
+	* travis.yml.in (env): Bump LUAROCKS_BASE to luarocks-2.1.1.
+	* .travis.yml: Regenerate.
+
+	maint: regenerate .travis.yml.
+	* .travis.yml: Regenerate.
+
+	travis: install luarocks to work properly with compiled rocks.
+	* travis.yml.in (matrix): Add LUA_SUFFIX setting per Lua.
+	(install): configure luarocks with matching version, suffix and
+	include settings.
+
+	travis: restore library links for system libyaml.
+	Recent Travis CI VMs are missing libraries for libyaml in the
+	standard compiler search path.  Put them back in that case.
+	* travis.yml.in (install): If libyaml.so is not in /usr/lib,
+	search for suitable libraries and link them into place.
+
+2013-09-27  Gary V. Vaughan  <gary@gnu.org>
+
+	mkrockspecs: sort generated rockspec tables asciibetically.
+	* src/mkrockspecs.in (format): Collect and sort keys within
+	tables before returning stringification in order.
+	* NEWS: Update.
+
+2013-09-25  Gary V. Vaughan  <gary@gnu.org>
+
+	release: fix a typo in check-in-release-branch.
+	* build-aux/release.mk (check-in-release-branch): If we need to
+	create a new release branch, branch at the just tagged release,
+	rather than relying on there being no release history prior to
+	using this rule for the first time.
+
+	maint: remove build-aux/git-version-gen.
+	* build-aux/git-version-gen: Remove.  This script conflicts with
+	the way mkrockspecs expects versions to be formatted.
+
+	configury: support client set gitlog-to-changelog arguments.
+	* build-aux/release.mk (ChangeLog): If gitlog_args macro is set,
+	then pass it to gitlog-to-changelog script.
+
+	maint: add .version to gitignore.
+	* .gitignore: ignore .version.
+
+	travis: support non-travis using projects.
+	* build-aux/release.mk (_travis_yml): New macro, can be set to
+	empty in local.mk to prevent travis rules being triggered.
+	(release_extra_dist): Use it instead of hard-coding.
+
+	maint: add some gnulib scripts used by GNU Zile.
+	Add a few additional files to enable Zile to use slingshot instead
+	of tracking a fully blown gnulib subproject for the same.
+	* README-release, build-aux/git-version-gen, build-aux/gnupload,
+	build-aux/update-copyright: Copied from gnulib.
+	* Makefile.am (doc_DATA): New declaration to support Zile.
+
+2013-09-16  Gary V. Vaughan  <gary@gnu.org>
+
+	bootstrap: sync with upstream.
+	* bootstrap: Pick up recent fixes from upstream.
+
+2013-09-12  Gary V. Vaughan  <gary@gnu.org>
+
+	announcement: show luarocks install command correctly.
+	* build-aux/release.mk (announcement): Format improvements.
+	* NEWS: Update.
+
+	specl: SPECL_OPTS now works correctly.
+	* GNUmakefile (SPECL_OPTS): Append the verbose option, even when
+	there are additional user-defined SPECL_OPTS.
+	* NEWS: Update.
+
+2013-08-30  Gary V. Vaughan  <gary@gnu.org>
+
+	bootstrap: sync with upstream.
+	* bootstrap: Sync with upstream, to fix a bug that still clones
+	gnulib into the build tree even when gnulib_tool=true is set by
+	bootstrap.conf.
+	* gnulib: Not used.  Remove.
+
+	configury: bump release version to 5.
+	* configure.ac (AC_INIT): Bump release version to 5.
+
+	maint: post-release administrivia.
+	* NEWS: Add header line for next release.
+	* .prev-version: Record previous version.
+	* ./local.mk (old_NEWS_hash): Auto-update.
 
 	Release version 4
 	* NEWS: Record release date.
@@ -27,11 +137,13 @@
 	much improved by putting the test fils in a subdirectory and
 	traversing only that.
 
+2013-08-29  Gary V. Vaughan  <gary@gnu.org>
+
 	bootstrap: sync with upstream.
 	* bootstrap: Use the latest upstream version with better portability
 	to OpenBSD, and CLI compatibility with the GNU bootstrap script.
 
-2013-08-25  Gary V. Vaughan  <gary@gnu.org>
+2013-08-26  Gary V. Vaughan  <gary@gnu.org>
 
 	mkrockspecs: don't dereference the lyaml.load return table.
 	* src/mkrockspecs.in: Now that we expect the API to be consistent
@@ -95,8 +207,6 @@
 	set up correctly when cross-compiling.
 	From Christian Ege.
 
-2013-06-27  Gary V. Vaughan  <gary@gnu.org>
-
 	travis: handle luadoc and ldoc specially.
 	Both luadoc and ldoc behave badly with lua5.2 on Travis' Ubuntu
 	Precise distros, but work properly if installed separately into
@@ -107,7 +217,7 @@
 	work with ldoc.
 	* NEWS: Update.
 
-2013-05-24  Gary V. Vaughan  <gary@gnu.org>
+2013-05-25  Gary V. Vaughan  <gary@gnu.org>
 
 	release: copy scm_rockspec to release branch.
 	* Makefile.am (save_release_files): Default setting.
@@ -286,8 +396,6 @@
 	* bootstrap.slingshot: New file. Source this from bootstrap.conf to
 	integrate slingshot.
 
-2013-05-05  Gary V. Vaughan  <gary@gnu.org>
-
 	travis: make additional bootstrap rocks configurable.
 	* configure.ac (EXTRA_ROCKS): Set to lyaml, which is always
 	needed to run slingshot mkrockspecs.
@@ -303,6 +411,8 @@
 	parent project that doesn't have all the listed fragments.
 	* local.mk: Put project specific fragment includes here.
 
+2013-05-05  Gary V. Vaughan  <gary@gnu.org>
+
 	travis: regenerate .travis.yml.
 	* .travis.yml: Regenerate.
 
@@ -323,8 +433,6 @@
 	an attachment.
 	NEWS: Update.
 
-2013-05-01  Gary V. Vaughan  <gary@gnu.org>
-
 	maint: move old_NEWS_hash into local.mk.
 	* Makefile.am (old_NEWS_hash): Move from here...
 	* local.mk: New file. ...to here.
@@ -384,8 +492,6 @@
 	* README.md: Add some blank lines around list items to get a
 	definition-list-like display.
 
-2013-04-28  Gary V. Vaughan  <gary@gnu.org>
-
 	release: distribute .autom4te.cfg.
 	* build-aux/release.mk (release_extra_dist): Add .autom4te.cfg.
 
@@ -430,6 +536,8 @@
 	release: ensure git rockspec is available for announcement.
 	* build-aux/release.mk (announcement): Add depedency on scm_rockspec.
 
+2013-04-28  Gary V. Vaughan  <gary@gnu.org>
+
 	release: create new release branch at v1 tag.
 	* build-aux/release.mk (check-in-release-branch): If there is no
 	release branch yet, create the new at the v1 tag rather than the

GNUmakefile

@@ -29,7 +29,8 @@ distcheck: $(local-check)
 # Use 'make check V=1' for verbose output, or set SPECL_OPTS to
 # pass alternative options to specl command.
 
-SPECL_OPTS     ?= $(specl_verbose_$(V))
+SPECL_OPTS     ?=
+SPECL_OPTS     += $(specl_verbose_$(V))
 specl_verbose_  = $(specl_verbose_$(AM_DEFAULT_VERBOSITY))
 specl_verbose_0 =
 specl_verbose_1 = --verbose --formatter=report

Makefile.am

@@ -49,6 +49,7 @@ bin_SCRIPTS		=
 check_local		=
 dist_bin_SCRIPTS	=
 dist_lua_DATA		=
+doc_DATA		=
 install_exec_hooks	=
 lib_LTLIBRARIES		=
 man_MANS		=

Makefile.in

@@ -247,7 +247,7 @@ am__uninstall_files_from_dir = { \
   }
 am__installdirs = "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" \
 	"$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" \
-	"$(DESTDIR)$(luadir)"
+	"$(DESTDIR)$(luadir)" "$(DESTDIR)$(docdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 SCRIPTS = $(bin_SCRIPTS) $(dist_bin_SCRIPTS)
 AM_V_P = $(am__v_P_@AM_V@)
@@ -272,7 +272,7 @@ am__can_run_installinfo = \
 man1dir = $(mandir)/man1
 NROFF = nroff
 MANS = $(man_MANS)
-DATA = $(dist_lua_DATA)
+DATA = $(dist_lua_DATA) $(doc_DATA)
 am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
@@ -397,11 +397,12 @@ bin_SCRIPTS = build-aux/mkrockspecs
 check_local = specl-check-local
 dist_bin_SCRIPTS = 
 dist_lua_DATA = 
+doc_DATA = 
 install_exec_hooks = 
 lib_LTLIBRARIES = 
 man_MANS = docs/mkrockspecs.1
 save_release_files = $(scm_rockspec)
-old_NEWS_hash = db6a999d91aba16f8a2eaa812b25b1d6
+old_NEWS_hash = e0348da6b6192ed4c00e3acdf306fb22
 specl_SPECS = \
 	$(srcdir)/specs/mkrockspecs_spec.yaml		\
 	$(NOTHING_ELSE)
@@ -639,6 +640,27 @@ uninstall-dist_luaDATA:
 	@list='$(dist_lua_DATA)'; test -n "$(luadir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
 	dir='$(DESTDIR)$(luadir)'; $(am__uninstall_files_from_dir)
+install-docDATA: $(doc_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
+	done
+
+uninstall-docDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(doc_DATA)'; test -n "$(docdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(docdir)'; $(am__uninstall_files_from_dir)
 tags TAGS:
 
 ctags CTAGS:
@@ -813,7 +835,7 @@ check-am: all-am
 check: check-am
 all-am: Makefile $(LTLIBRARIES) $(SCRIPTS) $(MANS) $(DATA)
 installdirs:
-	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(luadir)"; do \
+	for dir in "$(DESTDIR)$(libdir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(bindir)" "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(luadir)" "$(DESTDIR)$(docdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-am
@@ -870,7 +892,7 @@ info: info-am
 
 info-am:
 
-install-data-am: install-dist_luaDATA install-man
+install-data-am: install-dist_luaDATA install-docDATA install-man
 
 install-dvi: install-dvi-am
 
@@ -919,7 +941,8 @@ ps: ps-am
 ps-am:
 
 uninstall-am: uninstall-binSCRIPTS uninstall-dist_binSCRIPTS \
-	uninstall-dist_luaDATA uninstall-libLTLIBRARIES uninstall-man
+	uninstall-dist_luaDATA uninstall-docDATA \
+	uninstall-libLTLIBRARIES uninstall-man
 
 uninstall-man: uninstall-man1
 
@@ -932,15 +955,16 @@ uninstall-man: uninstall-man1
 	distcleancheck distdir distuninstallcheck dvi dvi-am html \
 	html-am info info-am install install-am install-binSCRIPTS \
 	install-data install-data-am install-dist_binSCRIPTS \
-	install-dist_luaDATA install-dvi install-dvi-am install-exec \
-	install-exec-am install-exec-hook install-html install-html-am \
-	install-info install-info-am install-libLTLIBRARIES \
-	install-man install-man1 install-pdf install-pdf-am install-ps \
-	install-ps-am install-strip installcheck installcheck-am \
-	installdirs maintainer-clean maintainer-clean-generic \
-	mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags-am \
-	uninstall uninstall-am uninstall-binSCRIPTS \
-	uninstall-dist_binSCRIPTS uninstall-dist_luaDATA \
+	install-dist_luaDATA install-docDATA install-dvi \
+	install-dvi-am install-exec install-exec-am install-exec-hook \
+	install-html install-html-am install-info install-info-am \
+	install-libLTLIBRARIES install-man install-man1 install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+	pdf-am ps ps-am tags-am uninstall uninstall-am \
+	uninstall-binSCRIPTS uninstall-dist_binSCRIPTS \
+	uninstall-dist_luaDATA uninstall-docDATA \
 	uninstall-libLTLIBRARIES uninstall-man uninstall-man1
 
 

NEWS

@@ -1,5 +1,26 @@
 Slingshot NEWS - User visible changes.
 
+* Noteworthy changes in release 5 (2013-12-08) [stable]
+
+** New Features:
+
+  - The announcement message is formatted for easier pasting into
+    github release notes.
+  - Mkrockspecs sorts table keys in generated rockspecs, so that
+    contents of build.modules is in order, for example.
+  - Travis builds will now use the latest upstream luarocks 2.1.1
+    release.
+
+** Bugs fixed:
+
+  - Specifying additional SPECL_OPTS in local.mk now works properly.
+  - Announcement message shows luarocks install command correctly.
+  - Travis builds now use the correct version of Lua for local
+    luarocks installation, so compiled dependency rocks actually
+    work.
+  - Fixed a typo in maint.mk no-submodule-changes rule.
+
+
 * Noteworthy changes in release 4 (2013-08-29) [stable]
 
 ** New Features: