Package: nis
Version: 3.17-32
Severity: wishlist
Tags: patch

This may also fix LP: #545723.
diff -u nis-3.17/debian/rules nis-3.17/debian/rules
--- nis-3.17/debian/rules
+++ nis-3.17/debian/rules
@@ -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
+	rm -f debian/debhelper.log
 
 # Architecture independant files.
 binary-indep:	build
diff -u nis-3.17/debian/changelog nis-3.17/debian/changelog
--- nis-3.17/debian/changelog
+++ nis-3.17/debian/changelog
@@ -1,3 +1,9 @@
+nis (3.17-33) UNRELEASED; urgency=low
+
+  * Use dh-autoreconf to fix FTBFS on arm64
+
+ -- dann frazier <da...@debian.org>  Sat, 15 Feb 2014 08:30:07 -0700
+
 nis (3.17-32) unstable; urgency=low
 
   * Fix postinst version comparison (closes: #610618).
diff -u nis-3.17/debian/control nis-3.17/debian/control
--- nis-3.17/debian/control
+++ nis-3.17/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Mark Brown <broo...@debian.org>
 Uploaders: Miquel van Smoorenburg <miqu...@cistron.nl>
 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
+Build-Depends: libgdbm-dev, gcc (>= 2.95), gettext, po-debconf, libslp-dev, libdbus-glib-1-dev, network-manager-dev, file, dh-autoreconf
 Vcs-Bzr: http://bzr.debian.org/bzr/pkg-nis/nis/debian/
 
 Package: nis
reverted:
--- nis-3.17/debian/fix-up-autoconf
+++ nis-3.17.orig/debian/fix-up-autoconf
@@ -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
only in patch2:
unchanged:
--- nis-3.17.orig/debian/autoreconf
+++ nis-3.17/debian/autoreconf
@@ -0,0 +1,3 @@
+ypbind-mt-1.20.1
+ypserv-2.19
+yp-tools-2.9
only in patch2:
unchanged:
--- nis-3.17.orig/yp-tools-2.9/configure.in
+++ nis-3.17/yp-tools-2.9/configure.in
@@ -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"
only in patch2:
unchanged:
--- nis-3.17.orig/ypbind-mt-1.20.1/configure.in
+++ nis-3.17/ypbind-mt-1.20.1/configure.in
@@ -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"
only in patch2:
unchanged:
--- nis-3.17.orig/ypserv-2.19/configure.in
+++ nis-3.17/ypserv-2.19/configure.in
@@ -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)

Reply via email to