Merge lp:~dannf/ubuntu/trusty/nis/lp1280666 into lp:ubuntu/trusty/nis

[dann frazier]

[lp:~dannf/ubuntu/trusty/nis/lp1280666]

36. By dann frazier on 2014-02-18

use dh_clean instead of manually removing debhelper log

=== added file 'debian/autoreconf'
--- debian/autoreconf	1970-01-01 00:00:00 +0000
+++ debian/autoreconf	2014-02-18 17:15:45 +0000
@@ -0,0 +1,3 @@
+ypbind-mt-1.20.1
+ypserv-2.19
+yp-tools-2.9

=== modified file 'debian/changelog'
--- debian/changelog	2012-06-25 16:55:01 +0000
+++ debian/changelog	2014-02-18 17:15:45 +0000
@@ -1,3 +1,9 @@
+nis (3.17-32ubuntu6) UNRELEASED; urgency=medium
+
+  * Use dh-autoreconf to fix FTBFS on arm64 (LP: #1280666)
+
+ -- dann frazier <[e-mail]>  Sat, 15 Feb 2014 13:15:00 -0700
+
 nis (3.17-32ubuntu5) quantal; urgency=low
 
   * debian/preinst: Check for existence of /etc/init.d/nis before

=== modified file 'debian/control'
--- debian/control	2012-02-28 00:20:56 +0000
+++ debian/control	2014-02-18 17:15:45 +0000
@@ -5,7 +5,7 @@
 XSBC-Original-Maintainer: Mark Brown <[e-mail]>
 Uploaders: Miquel van Smoorenburg <[e-mail]>
 Standards-Version: 3.8.1
-Build-Depends: libgdbm-dev, gcc (>= 2.95), gettext, po-debconf, libslp-dev, libdbus-glib-1-dev, network-manager-dev, file, debhelper (>= 7.3.15ubuntu2)
+Build-Depends: libgdbm-dev, gcc (>= 2.95), gettext, po-debconf, libslp-dev, libdbus-glib-1-dev, network-manager-dev, file, debhelper (>= 7.3.15ubuntu2), dh-autoreconf
 Vcs-Bzr: http://bzr.debian.org/bzr/pkg-nis/nis/debian/
 
 Package: nis

=== removed file 'debian/fix-up-autoconf'
--- debian/fix-up-autoconf	2004-08-10 01:41:45 +0000
+++ debian/fix-up-autoconf	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-#! /bin/sh
-#
-#	Prevent autoconf and automake if they're installed from
-#	generating new Makefiles and configure scripts by lowering
-#	the timestamps on the master files if they're newer than
-#	the generated files.
-#
-
-find . -name \*.am | while read master
-do
-	generated=${master%.am}.in
-	if [ -f $generated -a $master -nt $generated ]
-	then
-		echo touch -r $generated $master
-		touch -r $generated $master
-	fi
-done
-
-find . -name configure.in | while read master
-do
-	generated=${master%.in}
-	if [ -f $generated -a $master -nt $generated ]
-	then
-		echo touch -r $generated $master
-		touch -r $generated $master
-	fi
-done

=== modified file 'debian/rules'
--- debian/rules	2012-02-28 00:20:56 +0000
+++ debian/rules	2014-02-18 17:15:45 +0000
@@ -34,11 +34,7 @@
 
 build:
 # Builds the binary package.
-	#
-	#	Kludge to prevent configure from being rebuilt
-	#
-	sh debian/fix-up-autoconf
-	#
+	dh_autoreconf
 	-(cd $(YPTOOLS) && [ ! -f config.status ] && \
 		CFLAGS=$(CFLAGS) ./configure \
 		--prefix=/usr --mandir=/usr/share/man \
@@ -77,6 +73,8 @@
 	rm -f build debian/{files,substvars,templates.gen}
 	find . -name '*.bak' -o -name '*~' | xargs -r rm --
 	rm -f */config.cache
+	dh_autoreconf_clean
+	dh_clean
 
 # Architecture independant files.
 binary-indep:	build

=== modified file 'yp-tools-2.9/configure.in'
--- yp-tools-2.9/configure.in	2005-04-03 12:29:38 +0000
+++ yp-tools-2.9/configure.in	2014-02-18 17:15:45 +0000
@@ -4,6 +4,7 @@
 AC_CONFIG_SRCDIR([src/ypcat.c])
 AM_CONFIG_HEADER(config.h)
 AC_PREFIX_DEFAULT(/usr)
+AM_GNU_GETTEXT_VERSION(0.18.3)
 
 dnl Set of available languages.
 ALL_LINGUAS="de"

=== modified file 'ypbind-mt-1.20.1/configure.in'
--- ypbind-mt-1.20.1/configure.in	2006-11-28 15:27:25 +0000
+++ ypbind-mt-1.20.1/configure.in	2014-02-18 17:15:45 +0000
@@ -3,6 +3,7 @@
 AM_INIT_AUTOMAKE(ypbind-mt, 1.20.1)
 AM_CONFIG_HEADER(config.h)
 AC_PREFIX_DEFAULT(/usr)
+AM_GNU_GETTEXT_VERSION(0.18.3)
 
 dnl Set of available languages.
 ALL_LINGUAS="de"

=== modified file 'ypserv-2.19/configure.in'
--- ypserv-2.19/configure.in	2006-07-10 10:31:56 +0000
+++ ypserv-2.19/configure.in	2014-02-18 17:15:45 +0000
@@ -7,6 +7,7 @@
 AC_CONFIG_SRCDIR([ypserv/ypserv.c])
 AM_CONFIG_HEADER(config.h)
 AC_PREFIX_DEFAULT(/usr)
+AM_GNU_GETTEXT_VERSION(0.18.3)
 
 AC_SUBST(PACKAGE)
 AC_SUBST(VERSION)