From: Mark Wooding <mdw@distorted.org.uk>
Date: Sun, 29 May 2016 15:18:40 +0000 (+0100)
Subject: Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/cfd
X-Git-Tag: 1.3.12~4
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/cfd/commitdiff_plain/5eddcef785779760cc61248c5d4816c908268213?hp=1653c4e94b82d19bb316cdf6d2ee7ce7edbe397d

Merge branch 'master' of git.distorted.org.uk:~mdw/publish/public-git/cfd

* 'master' of git.distorted.org.uk:~mdw/publish/public-git/cfd:
  Release 1.3.11.
  debian/control: Fix build-depends.
  debian/source/format: Apparently there should be one of these.
  debian/control: Fix my email address.
  Makefile.am: We no longer need to make the COPYING link on distribution.
  .gitignore: COPYING is now a symbolic link, made at setup time.
  Reinstate erroneously deleted `*.tex' and `*.texi' files.
---

diff --git a/debian/control b/debian/control
index 54640aa..af08b1c 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.1.1
 
 Package: cfd
 Architecture: all
-Recommends: autoconf, automake
+Recommends: autoconf, autoconf-archive, automake, libtool
 Description: A collection of miscellaneous bits of build system.
  The common files distribution (CFD) contains standard boilerplate files
  and some handy autoconf macros.  It also contains some scripts which