Bug#732588: rarian: use dh-autoreconf for better new-port coverage

[Colin Watson]

Package: rarian
Version: 0.8.1-5
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu ubuntu-patch trusty

Hi,

The ppc64el port requires a patch to libtool.m4.  I don't think that's
in Debian yet, but when it is it will require autoreconfing a bunch of
packages to pick it up.  rarian could handle this quite easily by using
dh-autoreconf, which will update its copies of the libtool macros.  It
needs a couple of patches to avoid breaking with current autotools, but
making sure that the build system can be regenerated correctly seems
like no bad thing.

  * Use dh-autoreconf to update libtool macros for new ports.  This also
    requires fixing an m4 syntax error in configure.ac and removing the
    nonexistent "dist-gzip" Automake option.

diff -Nru rarian-0.8.1/debian/control rarian-0.8.1/debian/control
--- rarian-0.8.1/debian/control	2010-07-04 16:31:53.000000000 +0100
+++ rarian-0.8.1/debian/control	2013-12-19 03:11:17.000000000 +0000
@@ -10,7 +10,7 @@
 Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Josselin Mouette <joss at debian.org>, Sebastian Dröge <slomo at debian.org>
 Build-Depends: cdbs,
                debhelper (>= 5),
-               autotools-dev,
+               dh-autoreconf,
                xsltproc,
                xml-core (>= 0.06),
                gnome-pkg-tools
diff -Nru rarian-0.8.1/debian/control.in rarian-0.8.1/debian/control.in
--- rarian-0.8.1/debian/control.in	2010-07-04 16:30:51.000000000 +0100
+++ rarian-0.8.1/debian/control.in	2013-12-19 03:00:39.000000000 +0000
@@ -5,7 +5,7 @@
 Uploaders: @GNOME_TEAM@
 Build-Depends: cdbs,
                debhelper (>= 5),
-               autotools-dev,
+               dh-autoreconf,
                xsltproc,
                xml-core (>= 0.06),
                gnome-pkg-tools
diff -Nru rarian-0.8.1/debian/patches/04_m4_syntax.patch rarian-0.8.1/debian/patches/04_m4_syntax.patch
--- rarian-0.8.1/debian/patches/04_m4_syntax.patch	1970-01-01 01:00:00.000000000 +0100
+++ rarian-0.8.1/debian/patches/04_m4_syntax.patch	2013-12-19 03:06:36.000000000 +0000
@@ -0,0 +1,18 @@
+Description: Fix m4 syntax so that autoreconf doesn't break
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2013-12-19
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,7 +5,7 @@
+ AC_INIT(rarian, 0.8.1)
+ AC_CONFIG_SRCDIR([util/rarian-example.c])
+ AC_CONFIG_HEADER([config.h])
+-AM_INIT_AUTOMAKE ([foreign dist-bzip2 dist-gzip])
++AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-gzip])
+ 
+ AM_MAINTAINER_MODE
+ 
diff -Nru rarian-0.8.1/debian/patches/05_no_dist_gzip_option.patch rarian-0.8.1/debian/patches/05_no_dist_gzip_option.patch
--- rarian-0.8.1/debian/patches/05_no_dist_gzip_option.patch	1970-01-01 01:00:00.000000000 +0100
+++ rarian-0.8.1/debian/patches/05_no_dist_gzip_option.patch	2013-12-19 03:11:02.000000000 +0000
@@ -0,0 +1,18 @@
+Description: Remove the nonexistent "dist-gzip" Automake option
+Author: Colin Watson <cjwatson at ubuntu.com>
+Forwarded: no
+Last-Update: 2013-12-19
+
+Index: b/configure.ac
+===================================================================
+--- a/configure.ac
++++ b/configure.ac
+@@ -5,7 +5,7 @@
+ AC_INIT(rarian, 0.8.1)
+ AC_CONFIG_SRCDIR([util/rarian-example.c])
+ AC_CONFIG_HEADER([config.h])
+-AM_INIT_AUTOMAKE([foreign dist-bzip2 dist-gzip])
++AM_INIT_AUTOMAKE([foreign dist-bzip2])
+ 
+ AM_MAINTAINER_MODE
+ 
diff -Nru rarian-0.8.1/debian/patches/series rarian-0.8.1/debian/patches/series
--- rarian-0.8.1/debian/patches/series	2010-07-04 16:30:51.000000000 +0100
+++ rarian-0.8.1/debian/patches/series	2013-12-19 03:09:54.000000000 +0000
@@ -1,3 +1,5 @@
 01_info_shortnames.patch
 02_crash_no_extension.patch
 03_language.patch
+04_m4_syntax.patch
+05_no_dist_gzip_option.patch
diff -Nru rarian-0.8.1/debian/rules rarian-0.8.1/debian/rules
--- rarian-0.8.1/debian/rules	2010-07-04 16:30:51.000000000 +0100
+++ rarian-0.8.1/debian/rules	2013-12-19 02:59:58.000000000 +0000
@@ -3,6 +3,7 @@
 include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
 -include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS += --enable-skdb-update=no

Thanks,

-- 
Colin Watson                                       [cjwatson at ubuntu.com]