From: Mark Wooding <mdw@distorted.org.uk>
Date: Fri, 8 May 2020 11:29:24 +0000 (+0100)
Subject: Merge branch '1.3.x'
X-Git-Url: https://git.distorted.org.uk/~mdw/runlisp/commitdiff_plain/59b8d96508ed3becd57a5fb9ae1d3368d5074f94

Merge branch '1.3.x'

* 1.3.x:
  Release 1.3.15.
  mdwsetup.py: Adjust exit status from `subprocess'.
  mdwsetup.py: Fix unbound variable reference in error case.
  mdwsetup.py: Add missing `OS.' qualifier on `W...' calls.
  texinice.tex: Cope with new names for page-dimension registers.
  Makefile.am:  Tweak `silent-rules' machinery.
  auto-version.in: Don't insist that `.git' is a directory.
---

59b8d96508ed3becd57a5fb9ae1d3368d5074f94
diff --cc debian/changelog
index 35b4ece,35eacba..1ec7b65
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,11 +1,17 @@@
 +cfd (1.3.99~) experimental; urgency=medium
 +
 +  * (placeholder for next minor release)
 +
 + -- Mark Wooding <mdw@distorted.org.uk>  Tue, 01 Oct 2019 12:53:43 +0100
 +
+ cfd (1.3.15) experimental; urgency=medium
+ 
+   * Fix `auto-version' to work in external worktrees.
+   * Fix `texinice.tex' to work with later versions of Texinfo.
+   * Fix a number of minor bugs in `mdwsetup.py'.
+ 
+  -- Mark Wooding <mdw@distorted.org.uk>  Fri, 08 May 2020 12:28:11 +0100
+ 
  cfd (1.3.14) experimental; urgency=low
  
    * Fix various `gplmumble.tex' files so that they can be included from