[Pkg-citadel-devel] Bug#727399: libcitadel: update config.{sub, guess} for the AArch64 port

[Colin Watson]

Control: tag -1 patch

On Wed, Oct 23, 2013 at 11:12:02PM +0000, Matthias Klose wrote:
> The package fails to build on arm64 (aarch64-linux-gnu), because the
> config.{guess,sub} files are out of date, and are not updated during
> the build.  If possible, please do not update these files directly,
> but build-depend on autotools-dev instead, and use the tools provided
> by autotools-dev to update these files.

  * Use the autotools-dev dh addon to update config.guess/config.sub for
    arm64.

diff -u libcitadel-8.20/debian/control libcitadel-8.20/debian/control
--- libcitadel-8.20/debian/control
+++ libcitadel-8.20/debian/control
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Citadel Team <pkg-citadel-devel at lists.alioth.debian.org>
 Uploaders: Wilfried Goesgens <dothebart at citadel.org>, Michael Meskes <meskes at debian.org>, Alexander Wirt <formorer at debian.org>
-Build-Depends: debhelper (>= 5), zlib1g-dev, quilt (>= 0.40)
+Build-Depends: debhelper (>= 5), zlib1g-dev, quilt (>= 0.40), autotools-dev
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/pkg-citadel/libcitadel.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-citadel/libcitadel.git
diff -u libcitadel-8.20/debian/rules libcitadel-8.20/debian/rules
--- libcitadel-8.20/debian/rules
+++ libcitadel-8.20/debian/rules
@@ -31,6 +31,7 @@
 configure: patch configure-stamp
 configure-stamp:
 	dh_testdir
+	dh_autotools-dev_updateconfig
 
 	CPPFLAGS="$(CPPFLAGS)" CFLAGS="$(CFLAGS)" LDFLAGS="$(LDFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 		$(EXTRA_ARGS) \
@@ -57,6 +58,7 @@
 
 	-rm -f libcitadel.pc sysdep.h tests/Makefile config.log
 
+	dh_autotools-dev_restoreconfig
 	dh_clean
 
 install: install-stamp

Thanks,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]