sorry, here is the complete patch, including the change to use dh-autoreconf.
diff -Nru xapian-bindings-1.2.17/debian/changelog xapian-bindings-1.2.17/debian/changelog --- xapian-bindings-1.2.17/debian/changelog 2014-01-31 01:59:53.000000000 +0000 +++ xapian-bindings-1.2.17/debian/changelog 2014-04-28 13:26:57.000000000 +0000 @@ -1,3 +1,17 @@ +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. @@ -10,6 +24,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 @@ -33,6 +54,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.17/debian/control xapian-bindings-1.2.17/debian/control --- xapian-bindings-1.2.17/debian/control 2014-01-31 03:13:00.000000000 +0000 +++ xapian-bindings-1.2.17/debian/control 2014-04-28 11:41:50.000000000 +0000 @@ -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~), python, python-all-dev (>= 2.6.6-3~), tcl-dev, ruby1.9.1-dev, ruby2.0-dev, ruby1.9.1, ruby2.0, libxapian-dev (>= 1.2.17), libxapian-dev (<< 1.3.0), autotools-dev +Build-Depends: debhelper (>= 7.0.50~), python, python-all-dev (>= 2.6.6-3~), tcl-dev, ruby2.0-dev, ruby2.1-dev, ruby2.0, ruby2.1, libxapian-dev (>= 1.2.17), libxapian-dev (<< 1.3.0), autotools-dev, automake1.11, dh-autoreconf X-Python-Version: >= 2.3 XS-Ruby-Versions: all Homepage: http://xapian.org/ @@ -59,7 +60,7 @@ Depends: ruby | ruby-interpeter, ${shlibs:Depends}, ${misc:Depends} Replaces: libxapian-ruby1.8 (<< 1.2.15-1~), libxapian-ruby1.9.1 (<< 1.2.15-1~) Breaks: libxapian-ruby1.8 (<< 1.2.15-1~), libxapian-ruby1.9.1 (<< 1.2.15-1~) -Provides: libxapian-ruby1.9.1 +Provides: Suggests: xapian-doc Description: Xapian search engine interface for Ruby This package provides Xapian Ruby bindings built for Ruby. @@ -74,12 +75,3 @@ . The Xapian Ruby bindings provide an interface to the Xapian library from the Ruby programming language, allowing both indexing and retrieval operations. - -Package: libxapian-ruby1.9.1 -Section: oldlibs -Priority: extra -Architecture: all -depends: ${misc:Depends}, ruby-xapian -Description: Transitional package for ruby-xapian - This is a transitional package to ease upgrades to the ruby-xapian package. - It can be safely removed. diff -Nru xapian-bindings-1.2.17/debian/control.in xapian-bindings-1.2.17/debian/control.in --- xapian-bindings-1.2.17/debian/control.in 2014-01-24 01:50:09.000000000 +0000 +++ xapian-bindings-1.2.17/debian/control.in 2014-04-28 11:17:39.000000000 +0000 @@ -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.17/debian/ruby-xapian.install xapian-bindings-1.2.17/debian/ruby-xapian.install --- xapian-bindings-1.2.17/debian/ruby-xapian.install 2014-01-31 03:13:00.000000000 +0000 +++ xapian-bindings-1.2.17/debian/ruby-xapian.install 2014-04-28 11:54:18.000000000 +0000 @@ -1,5 +1,4 @@ -usr/lib/ruby/vendor_ruby/1.9.1/xapian.rb usr/lib/ruby/vendor_ruby -usr/lib/ruby/vendor_ruby/*.*/*-* -usr/share/doc/xapian-bindings-ruby1.9.1/ruby/* usr/share/doc/ruby-xapian -usr/share/doc/xapian-bindings-ruby1.9.1/ruby/examples/*.rb usr/share/doc/ruby-xapian/examples +usr/lib/ruby/vendor_ruby/2.1.0/xapian.rb usr/lib/ruby/vendor_ruby +usr/share/doc/xapian-bindings-ruby2.1/ruby/* usr/share/doc/ruby-xapian +usr/share/doc/xapian-bindings-ruby2.1/ruby/examples/*.rb usr/share/doc/ruby-xapian/examples usr/lib/*/ruby/vendor_ruby/*/_xapian.so diff -Nru xapian-bindings-1.2.17/debian/rules xapian-bindings-1.2.17/debian/rules --- xapian-bindings-1.2.17/debian/rules 2014-01-31 03:12:38.000000000 +0000 +++ xapian-bindings-1.2.17/debian/rules 2014-04-28 13:23:27.000000000 +0000 @@ -52,7 +52,11 @@ rubyarchdir := vendorarchdir # Ruby 2.0 will debut in jessie and was in Ubuntu saucy, which neatly matches # the versions on new ruby policy. -ifeq ($(findstring .$(CODENAME)., .saucy.trusty.), ) +ifeq ($(findstring .$(CODENAME)., .utopic.), ) +# Ruby 1.8 and 1.9 should be gone in jessie. +RUBY_VERSIONS := 2.0 2.1 +RUBY_PROVIDES := +else ifeq ($(findstring .$(CODENAME)., .saucy.trusty.), ) # Ruby 1.8 should be gone in jessie. RUBY_VERSIONS := 1.9.1 2.0 RUBY_PROVIDES := libxapian-ruby1.9.1 @@ -177,6 +181,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 + maint: debian/control maintclean: clean @@ -236,11 +244,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; \ @@ -342,6 +346,7 @@ # We only need one xapian.rb for ruby-xapian, and it should be the same # for all versions, so if present, check that the 1.8 and 2.0 versions # are the same as the 1.9.1, then throw them away. +ifeq (0,1) test ! -f debian/tmp/usr/lib/ruby/vendor_ruby/1.8/xapian.rb || \ diff debian/tmp/usr/lib/ruby/vendor_ruby/1.8/xapian.rb \ debian/tmp/usr/lib/ruby/vendor_ruby/1.9.1/xapian.rb @@ -350,6 +355,9 @@ debian/tmp/usr/lib/ruby/vendor_ruby/1.9.1/xapian.rb rm -f debian/tmp/usr/lib/ruby/vendor_ruby/1.8/xapian.rb \ debian/tmp/usr/lib/ruby/vendor_ruby/2.0*/xapian.rb +else + rm -f debian/tmp/usr/lib/ruby/vendor_ruby/2.0*/xapian.rb +endif # The same goes for the docs. Docs for 1.9.1 are installed by # ruby-xapian.install. rm -rf debian/tmp/usr/share/doc/xapian-bindings-ruby1.8 \ @@ -407,12 +415,6 @@ binary-indep: build-indep install dh_testdir dh_testroot - for v in $(RUBY_VERSIONS); do \ - set -e; \ - d=debian/libxapian-ruby$$v/usr/share/doc; \ - mkdir -p "$$d"; \ - ln -s ruby-xapian "$$d/libxapian-ruby$$v"; \ - done dh_fixperms dh_installdeb dh_gencontrol @@ -424,6 +426,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
