Use older versions of Automake and GNU Gettext

.gitignore

@@ -4,6 +4,7 @@ Makefile
 TAGS
 .deps/
 
+/.pc/
 /autom4te.cache
 /config.h
 /config.log

debian/changelog

@@ -6,10 +6,14 @@ trader (7.10-1) unstable; urgency=low
   * Added XPM versions of the icons for the Debian menu system.
   * Updated to Debian Policy 3.9.8 (no changes).
   * Removed superfluous debian/trader.dirs file.
-  * Require GNU Gettext 0.19.3 (as shipped with Debian Jessie) or newer.
-  * Added a dependency on pkg-config for rebuilding Automake/Autoconf files.
+  * Require GNU Gettext 0.19.3 (as shipped with Debian Jessie) or newer,
+    as well as Automake 1.14 or newer.  Upstream requires newer versions
+    of these tools, but the older versions work correctly.
+  * Removed the inhibition on updating the GNU Gettext files as required.
+  * Added a build dependency on pkg-config for rebuilding Automake/Autoconf
+    files.
 
- -- John Zaitseff <J.Zaitseff@zap.org.au>  Fri, 02 Jun 2017 11:46:16 +1000
+ -- John Zaitseff <J.Zaitseff@zap.org.au>  Fri, 02 Jun 2017 12:17:37 +1000
 
 trader (7.9-2) unstable; urgency=low
 

debian/patches/series

@@ -1 +1,2 @@
 
+use-older-tools

debian/patches/use-older-tools

@@ -0,0 +1,41 @@
+Use older versions of Automake and GNU Gettext
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,7 +35,7 @@
+ AC_CONFIG_SRCDIR([src/trader.c])
+ AC_CONFIG_AUX_DIR([build-aux])
+ AC_CONFIG_HEADERS([config.h])
+-AM_INIT_AUTOMAKE([1.15 -Wall -Werror foreign dist-xz])
++AM_INIT_AUTOMAKE([1.14 -Wall -Werror foreign dist-xz])
+ AM_MAINTAINER_MODE([enable])
+ AC_CONFIG_LIBOBJ_DIR([lib])
+ 
+@@ -54,7 +54,7 @@
+ AC_TYPE_SSIZE_T
+ 
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.19.8])
++AM_GNU_GETTEXT_VERSION([0.19.3])
+ 
+ gl_INIT
+ 
+--- a/INSTALL
++++ b/INSTALL
+@@ -39,7 +39,7 @@
+     multibyte character sequences (such as UTF-8) require a wide-character
+     version of Curses, such as NcursesW, to work correctly.
+ 
+-4.  The GNU Gettext library, version 0.19.8 or later, to allow the game to
++4.  The GNU Gettext library, version 0.19.3 or later, to allow the game to
+     use languages other than English;  this is also called Native Language
+     Support.  If you do not have  this library (and do not wish to install
+     it), you may pass "--disable-nls" to the configure script.
+@@ -169,7 +169,7 @@
+ following additional tools installed on your system to do so:
+ 
+ 1.  Autoconf v2.69 or later (http://www.gnu.org/software/autoconf/)
+-2.  Automake v1.15 or later (http://www.gnu.org/software/automake/)
++2.  Automake v1.14 or later (http://www.gnu.org/software/automake/)
+ 3.  GNU Portability Library (http://www.gnu.org/software/gnulib/)
+ 
+ The  GNU Portability Library  may  be installed  by retrieving  the latest

debian/rules

@@ -4,7 +4,7 @@
 # Copyright (C) 2011-17, John Zaitseff
 
 %:
-	env AUTOPOINT=true  dh $@ --with autoreconf
+	dh $@ --with autoreconf
 
 override_dh_auto_configure:
 	dh_auto_configure -- --prefix=/usr --bindir=/usr/games