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: https://git.distorted.org.uk/~mdw/cfd/commitdiff_plain/5eddcef785779760cc61248c5d4816c908268213?hp=-c

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.
---

5eddcef785779760cc61248c5d4816c908268213
diff --combined debian/control
index 8350b40,54640aa..af08b1c
--- a/debian/control
+++ b/debian/control
@@@ -1,13 -1,13 +1,13 @@@
  Source: cfd
  Section: devel
  Priority: extra
- Maintainer: Mark Wooding <mdw@nsict.org>
- Build-Depends: debhelper (>> 8.0)
+ Maintainer: Mark Wooding <mdw@distorted.org.uk>
+ Build-Depends: debhelper (>> 8.0), automake, texinfo
  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