Package: src:xapian-bindings
Version: 1.2.18-1
Tags: patch

please build using dh-autoreconf, fixing a ftbfs on ppc64el.

patch attached. checked that this builds on Debian unstable.  please address the
explicit automake-1.11 dependency upstream.
diff -Nru xapian-bindings-1.2.18/debian/changelog 
xapian-bindings-1.2.18/debian/changelog
--- xapian-bindings-1.2.18/debian/changelog     2014-06-29 06:56:04.000000000 
+0200
+++ xapian-bindings-1.2.18/debian/changelog     2014-08-05 21:53:42.000000000 
+0200
@@ -1,3 +1,10 @@
+xapian-bindings (1.2.18-1ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build using dh-autoreconf, explicitly using automake-1.11.
+
+ -- Matthias Klose <d...@ubuntu.com>  Tue, 05 Aug 2014 21:45:56 +0200
+
 xapian-bindings (1.2.18-1) unstable; urgency=medium
 
   * New upstream release.
@@ -23,6 +30,20 @@
 
  -- Olly Betts <o...@survex.com>  Sun, 04 May 2014 17:15:00 +1300
 
+xapian-bindings (1.2.17-1ubuntu2) utopic; urgency=medium
+
+  * Fix the binary-indep build.
+
+ -- Matthias Klose <d...@ubuntu.com>  Mon, 28 Apr 2014 15:23:29 +0200
+
+xapian-bindings (1.2.17-1ubuntu1) utopic; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build using dh-autoreconf, explicitly using automake-1.11.
+  * Build for ruby2.0 and ruby2.1 only.
+
+ -- Matthias Klose <d...@ubuntu.com>  Mon, 28 Apr 2014 13:13:17 +0200
+
 xapian-bindings (1.2.17-1) unstable; urgency=medium
 
   * New upstream release.
@@ -35,6 +56,13 @@
 
  -- Olly Betts <o...@survex.com>  Fri, 31 Jan 2014 14:57:39 +1300
 
+xapian-bindings (1.2.16-2ubuntu1) trusty; urgency=medium
+
+  * Merge with Debian; remaining changes:
+    - Build using dh-autoreconf, explicitly using automake-1.11.
+
+ -- Matthias Klose <d...@ubuntu.com>  Mon, 06 Jan 2014 16:34:43 +0100
+
 xapian-bindings (1.2.16-2) unstable; urgency=low
 
   * debian/rules: Fix accidentally hard-coded "x86_64-linux-gnu" in path of
@@ -58,6 +86,25 @@
 
  -- Olly Betts <o...@survex.com>  Fri, 06 Dec 2013 15:18:06 +1300
 
+xapian-bindings (1.2.15-4ubuntu3) trusty; urgency=medium
+
+  * Explicitely use automake1.11.
+
+ -- Matthias Klose <d...@ubuntu.com>  Wed, 18 Dec 2013 16:59:30 +0100
+
+xapian-bindings (1.2.15-4ubuntu2) trusty; urgency=medium
+
+  * Build using dh-autoreconf.
+
+ -- Matthias Klose <d...@ubuntu.com>  Wed, 18 Dec 2013 16:15:18 +0100
+
+xapian-bindings (1.2.15-4ubuntu1) trusty; urgency=low
+
+  * debian/control, debian/rules, debian/ruby-xapian.install*: stop
+    building for ruby1.8. (LP: #1254052)
+
+ -- Marc Deslauriers <marc.deslauri...@ubuntu.com>  Fri, 29 Nov 2013 15:44:16 
-0500
+
 xapian-bindings (1.2.15-4) unstable; urgency=low
 
   * Add missing dh_installdeb so the ruby bindings postinst files actually
diff -Nru xapian-bindings-1.2.18/debian/control 
xapian-bindings-1.2.18/debian/control
--- xapian-bindings-1.2.18/debian/control       2014-06-08 06:01:45.000000000 
+0200
+++ xapian-bindings-1.2.18/debian/control       2014-08-05 21:55:42.000000000 
+0200
@@ -1,9 +1,10 @@
 Source: xapian-bindings
 Section: libs
 Priority: optional
-Maintainer: Olly Betts <o...@survex.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Olly Betts <o...@survex.com>
 Standards-Version: 3.9.5
-Build-Depends: debhelper (>= 7.0.50~), ruby-all-dev, ruby, python, 
python-all-dev (>= 2.6.6-3~), tcl-dev, libxapian-dev (>= 1.2.17), libxapian-dev 
(<< 1.3.0), autotools-dev
+Build-Depends: debhelper (>= 7.0.50~), ruby-all-dev, ruby, python, 
python-all-dev (>= 2.6.6-3~), tcl-dev, libxapian-dev (>= 1.2.18), libxapian-dev 
(<< 1.3.0), autotools-dev, automake1.11, dh-autoreconf
 X-Python-Version: >= 2.3
 XS-Ruby-Versions: all
 Homepage: http://xapian.org/
diff -Nru xapian-bindings-1.2.18/debian/control.in 
xapian-bindings-1.2.18/debian/control.in
--- xapian-bindings-1.2.18/debian/control.in    2014-06-08 05:47:17.000000000 
+0200
+++ xapian-bindings-1.2.18/debian/control.in    2014-08-05 21:53:42.000000000 
+0200
@@ -1,9 +1,10 @@
 Source: xapian-bindings
 Section: libs
 Priority: optional
-Maintainer: Olly Betts <o...@survex.com>
+Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com>
+XSBC-Original-Maintainer: Olly Betts <o...@survex.com>
 Standards-Version: 3.9.5
-Build-Depends: @BUILD_DEPS@ autotools-dev
+Build-Depends: @BUILD_DEPS@ autotools-dev, automake1.11, dh-autoreconf
 @X_PYTHON_VERSION@
 @XS_RUBY_VERSIONS@
 Homepage: http://xapian.org/
diff -Nru xapian-bindings-1.2.18/debian/rules 
xapian-bindings-1.2.18/debian/rules
--- xapian-bindings-1.2.18/debian/rules 2014-06-08 06:09:44.000000000 +0200
+++ xapian-bindings-1.2.18/debian/rules 2014-08-05 21:53:42.000000000 +0200
@@ -194,6 +194,10 @@
 # a bit of time and diskspace while building.
 commonconfflags += --disable-dependency-tracking
 
+# testsuite fails with newer ones
+export AUTOMAKE = automake-1.11
+export ACLOCAL = aclocal-1.11
+
 debian/control: maint
 
 maintclean: clean
@@ -263,11 +267,7 @@
 configure-stamp:
        dh_testdir
 
-       # Use the latest config.sub and config.guess from the autotools-dev
-       # package.
-       rm -f config.sub config.guess
-       ln -s /usr/share/misc/config.sub config.sub
-       ln -s /usr/share/misc/config.guess config.guess
+       dh_autoreconf
 
        for python in $(PYTHON_VERSIONS); do \
            set -e; \
@@ -459,6 +459,7 @@
        dh_testroot
        rm -rf debian/build
        rm -f config.sub config.guess
+       dh_autoreconf_clean
        dh_clean
 
 .PHONY: maint maintclean configure build build-arch build-indep install binary 
binary-arch binary-indep clean

Reply via email to