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.

diff --git a/debian/changelog b/debian/changelog
index 35eacba..1ec7b65 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+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.

diff --git a/debian/compat b/debian/compat
index 45a4fb7..f599e28 100644 (file)
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+10

diff --git a/debian/control b/debian/control
index af08b1c..e707a7b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: cfd
 Section: devel
 Priority: extra
 Maintainer: Mark Wooding <mdw@distorted.org.uk>
-Build-Depends: debhelper (>> 8.0), automake, texinfo
+Build-Depends: debhelper (>> 10), automake, texinfo
 Standards-Version: 3.1.1
 
 Package: cfd

diff --git a/debian/rules b/debian/rules
index 4cf60b1..0c0cde0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #! /usr/bin/make -f
 
-DH_OPTIONS = --parallel -Bdebian/build
-%:; dh $@ $(DH_OPTIONS)
+DH_OPTIONS = -Bdebian/build
+%:; dh $@ $(DH_OPTIONS) --without autoreconf
 
 override_dh_auto_install:
        dh_auto_install $(addprefix -O,$(DH_OPTIONS))