[Pkg-monitoring-maintainers] Bug#726396: ganglia: config.guess/config.sub out of date for arm64

[Colin Watson]

Package: ganglia
Version: 3.6.0-2
Severity: important
Tags: patch
User: debian-arm at lists.debian.org
Usertags: arm64

ganglia's config.guess/config.sub are out of date for the forthcoming
arm64 port.  The attached patch sets things up so that you don't have to
be bothered by this type of bug for future ports.

debian/rules was a bit strange.  It was using autoreconf without
--force, which was the root cause of this bug (--install makes
autoreconf copy missing auxiliary files, but it doesn't update existing
ones).  However, I think it also wasn't cleaning them up properly on
clean (which becomes more important with --force), and it was using
dh_autotools-dev_restoreconfig without a matching
dh_autotools-dev_updateconfig, which is just weird.

The simplest fix for all of this is to convert it all to dh-autoreconf.
You still need a helper rule as you're running autoreconf in two
directories, so I moved the existing code around and added --force.

  * Convert autoreconf handling to dh-autoreconf.
  * Pass --force to autoreconf so that it updates config.guess and
    config.sub (closes: #541107).

diff -Nru ganglia-3.6.0/debian/control ganglia-3.6.0/debian/control
--- ganglia-3.6.0/debian/control	2013-09-05 10:53:38.000000000 +0100
+++ ganglia-3.6.0/debian/control	2013-10-15 12:43:51.000000000 +0100
@@ -4,7 +4,7 @@
 Maintainer: Debian Monitoring Maintainers <pkg-monitoring-maintainers at lists.alioth.debian.org>
 Uploaders: Stuart Teasdale <sdt at debian.org>, Daniel Pocock <daniel at pocock.com.au>
 Homepage: http://www.ganglia.info/
-Build-Depends: debhelper (>> 9.0.0), librrd2-dev, autoconf, autotools-dev, automake, libapr1-dev, libexpat1-dev, python-dev, libconfuse-dev, po-debconf, libxml2-dev, libdbi0-dev, libpcre3-dev, gperf, libtool, rsync, libkvm-dev [kfreebsd-any]
+Build-Depends: debhelper (>> 9.0.0), librrd2-dev, dh-autoreconf, libapr1-dev, libexpat1-dev, python-dev, libconfuse-dev, po-debconf, libxml2-dev, libdbi0-dev, libpcre3-dev, gperf, rsync, libkvm-dev [kfreebsd-any]
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/pkg-monitoring/ganglia.git
 Vcs-Browser: http://git.debian.org/?p=pkg-monitoring/ganglia.git;a=summary
diff -Nru ganglia-3.6.0/debian/rules ganglia-3.6.0/debian/rules
--- ganglia-3.6.0/debian/rules	2013-09-05 10:52:30.000000000 +0100
+++ ganglia-3.6.0/debian/rules	2013-10-15 12:02:58.000000000 +0100
@@ -21,6 +21,10 @@
 endif
 
 
+autoreconf:
+	autoreconf --force --install
+	cd libmetrics && autoreconf --force --install
+
 config.status: configure
 	dh_testdir
 	# Just in case, make sure changelog exists
@@ -29,7 +33,7 @@
 	# Intermittent errors about missing Tpo files appear during
 	# the build, many people have suggested running autoreconf
 	# before a build can avert that:
-	autoreconf --install && (cd libmetrics && autoreconf --install)
+	dh_autoreconf debian/rules -- autoreconf
 	#chmod +x configure libmetrics/configure
 	./configure CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		--prefix=/usr --mandir=\$${prefix}/share/man \
@@ -61,7 +65,7 @@
 		ganglia-config contrib/ganglia_gmond.xml gmetad/gmetad.conf \
 		gmond/gmond.solaris.init gmond/modules/conf.d/modpython.conf solaris/pkginfo
 	#debconf-updatepo
-	dh_autotools-dev_restoreconfig
+	dh_autoreconf_clean
 	dh_clean
 
 install: build

-- 
Colin Watson                                       [cjwatson at ubuntu.com]