diff -Nru xchat-2.8.8/debian/changelog xchat-2.8.8/debian/changelog --- xchat-2.8.8/debian/changelog 2013-10-22 09:33:07.000000000 +0000 +++ xchat-2.8.8/debian/changelog 2013-12-26 22:25:10.000000000 +0000 @@ -1,3 +1,16 @@ +xchat (2.8.8-7.1ubuntu5) trusty; urgency=medium + + * Update config.guess/config.sub with dh_atotools. + + -- Dimitri John Ledkov Thu, 26 Dec 2013 22:25:10 +0000 + +xchat (2.8.8-7.1ubuntu4) trusty; urgency=medium + + * Use dh-autoreconf to update libtool for ppc64el port. + * Specify foreign automake option. + + -- Dimitri John Ledkov Thu, 26 Dec 2013 21:47:13 +0000 + xchat (2.8.8-7.1ubuntu3) trusty; urgency=low * Rebuild for Perl 5.18. diff -Nru xchat-2.8.8/debian/control xchat-2.8.8/debian/control --- xchat-2.8.8/debian/control 2013-07-30 12:57:26.000000000 +0000 +++ xchat-2.8.8/debian/control 2013-12-26 21:49:26.000000000 +0000 @@ -5,7 +5,7 @@ XSBC-Original-Maintainer: Davide Puricelli (evo) Uploaders: Bart Martens Standards-Version: 3.9.3 -Build-Depends: debhelper (>= 5), bison, libssl-dev, libglib2.0-dev, libgtk2.0-dev (>= 2.10.0), libperl-dev, gettext (>= 0.10.37), libtool, zlib1g-dev, perl (>= 5.8), python-dev, tcl-dev, autotools-dev, libdbus-glib-1-dev, libgtkspell-dev, gconf2, dpkg-dev (>= 1.13.19), libsexy-dev, chrpath, imagemagick +Build-Depends: debhelper (>= 5), bison, libssl-dev, libglib2.0-dev, libgtk2.0-dev (>= 2.10.0), libperl-dev, gettext (>= 0.10.37), libtool, zlib1g-dev, perl (>= 5.8), python-dev, tcl-dev, autotools-dev, dh-autoreconf, libdbus-glib-1-dev, libgtkspell-dev, gconf2, dpkg-dev (>= 1.13.19), libsexy-dev, chrpath, imagemagick Homepage: http://www.xchat.org/ Package: xchat diff -Nru xchat-2.8.8/debian/patches/automake-foreign.patch xchat-2.8.8/debian/patches/automake-foreign.patch --- xchat-2.8.8/debian/patches/automake-foreign.patch 1970-01-01 00:00:00.000000000 +0000 +++ xchat-2.8.8/debian/patches/automake-foreign.patch 2013-12-26 21:53:51.000000000 +0000 @@ -0,0 +1,14 @@ +Description: Specify foreign automake option. +Author: Dimitri John Ledkov + +--- xchat-2.8.8.orig/configure.in ++++ xchat-2.8.8/configure.in +@@ -8,7 +8,7 @@ AC_COPYRIGHT([Copyright (C) 1998-2010 Pe + AC_CONFIG_HEADERS([config.h]) + AC_CONFIG_SRCDIR([configure.in]) + +-AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define]) ++AM_INIT_AUTOMAKE([1.9 dist-bzip2 subdir-objects no-define foreign]) + + AM_MAINTAINER_MODE + AC_PROG_CC diff -Nru xchat-2.8.8/debian/patches/series xchat-2.8.8/debian/patches/series --- xchat-2.8.8/debian/patches/series 2013-07-30 12:55:43.000000000 +0000 +++ xchat-2.8.8/debian/patches/series 2013-12-26 21:53:42.000000000 +0000 @@ -33,3 +33,4 @@ 66_load_libnotify4.patch power-user-settings.patch fix-ftbfs-missing-gmodule.patch +automake-foreign.patch diff -Nru xchat-2.8.8/debian/rules xchat-2.8.8/debian/rules --- xchat-2.8.8/debian/rules 2013-07-30 12:55:43.000000000 +0000 +++ xchat-2.8.8/debian/rules 2013-12-26 22:24:45.000000000 +0000 @@ -13,10 +13,8 @@ configure: configure-stamp configure-stamp: - [ -f config.sub.d-r-orig ] || cp -p config.sub config.sub.d-r-orig - [ -f config.guess.d-r-orig ] || cp -p config.guess config.guess.d-r-orig - cp -f /usr/share/misc/config.sub . - cp -f /usr/share/misc/config.guess . + dh_autotools-dev_updateconfig + dh_autoreconf ./autogen.sh [ -f xchat.xpm ] || convert -resize 32x32 xchat.png xchat.xpm CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --datadir=/usr/share --sysconfdir=/etc --enable-python --enable-ipv6 \ --disable-mmx --enable-openssl --enable-tcl=/usr/lib \ @@ -37,8 +35,8 @@ dh_testdir dh_testroot [ ! -f Makefile ] || $(MAKE) distclean - [ ! -f config.sub.d-r-orig ] || mv config.sub.d-r-orig config.sub - [ ! -f config.guess.d-r-orig ] || mv config.guess.d-r-orig config.guess + dh_autoreconf_clean + dh_autotools-dev_restoreconfig rm -f xchat.xpm rm -f config.log rm -f xchat xchat-gnome @@ -48,7 +46,7 @@ rm -f src/common/dbus/org.xchat.service.service rm -f libtool dh_clean - + install: install-stamp install-stamp: build dh_testdir @@ -102,5 +100,5 @@ dh_md5sums -pxchat dh_builddeb -pxchat binary: binary-indep binary-arch - + .PHONY: build clean clean-stamp binary-indep binary-arch binary install