Package: xapian-bindings Version: 1.2.17-1 Severity: normal Tags: patch pending
Dear maintainer, I've prepared an NMU for xapian-bindings (versioned as 1.2.17-1.1) and uploaded it to DELAYED/3. Please feel free to tell me if I should delay it longer. [Chosing 3 days because this affects the ruby1.9.1-rm transition and apparently upcoming ports.] Regards. 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 02:59:53.000000000 +0100 +++ xapian-bindings-1.2.17/debian/changelog 2014-04-30 16:58:40.000000000 +0200 @@ -1,3 +1,24 @@ +xapian-bindings (1.2.17-1.1) unstable; urgency=medium + + * Non-maintainer upload. + + [ Christian Hofstaedtler ] + * Rebuild for Ruby 2.0/2.1, dropping Ruby 1.9.1. (Closes: #745924) + Thanks to Matthias Klose <d...@ubuntu.com> for the missing pieces + when I couldn't get this to build. (Basically this merges the + Ubuntu patch.) + * Apply patch to fix binary-indep build from Matthias Klose + <d...@ubuntu.com>. + * Apply patch to fix build on ppc64el from Matthias Klose + <d...@ubuntu.com>. + + [ Matthias Klose ] + * Fix the binary-indep build. + * Explicitely use automake1.11. + * Build using dh-autoreconf. (Closes: #746239) + + -- Christian Hofstaedtler <z...@debian.org> Wed, 30 Apr 2014 16:31:01 +0200 + xapian-bindings (1.2.17-1) unstable; urgency=medium * New upstream release. 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 04:13:00.000000000 +0100 +++ xapian-bindings-1.2.17/debian/control 2014-04-30 17:02:37.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional 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 +59,6 @@ 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 Suggests: xapian-doc Description: Xapian search engine interface for Ruby This package provides Xapian Ruby bindings built for Ruby. @@ -74,12 +73,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 02:50:09.000000000 +0100 +++ xapian-bindings-1.2.17/debian/control.in 2014-04-30 16:59:59.000000000 +0200 @@ -3,7 +3,7 @@ Priority: optional 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/control-ruby-new.in xapian-bindings-1.2.17/debian/control-ruby-new.in --- xapian-bindings-1.2.17/debian/control-ruby-new.in 2014-01-30 23:20:21.000000000 +0100 +++ xapian-bindings-1.2.17/debian/control-ruby-new.in 2014-04-30 16:36:25.000000000 +0200 @@ -6,7 +6,6 @@ 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: @RUBY_PROVIDES@ Suggests: xapian-doc Description: Xapian search engine interface for Ruby This package provides Xapian Ruby bindings built for Ruby. 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 04:13:00.000000000 +0100 +++ xapian-bindings-1.2.17/debian/ruby-xapian.install 2014-04-30 17:02:37.000000000 +0200 @@ -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/ruby-xapian.install.in xapian-bindings-1.2.17/debian/ruby-xapian.install.in --- xapian-bindings-1.2.17/debian/ruby-xapian.install.in 2014-01-24 02:54:30.000000000 +0100 +++ xapian-bindings-1.2.17/debian/ruby-xapian.install.in 2014-04-30 16:53:49.000000000 +0200 @@ -1,4 +1,3 @@ -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 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 04:12:38.000000000 +0100 +++ xapian-bindings-1.2.17/debian/rules 2014-04-30 17:01:00.000000000 +0200 @@ -52,9 +52,13 @@ 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_VERSIONS := 1.9 2.0 RUBY_PROVIDES := libxapian-ruby1.9.1 else RUBY_VERSIONS := 1.8 1.9.1 2.0 @@ -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; \ @@ -340,20 +344,12 @@ done ifdef XB_RUBY_VERSIONS # 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. - 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 - test ! -f debian/tmp/usr/lib/ruby/vendor_ruby/2.0*/xapian.rb || \ - diff debian/tmp/usr/lib/ruby/vendor_ruby/2.0*/xapian.rb \ - 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 - # The same goes for the docs. Docs for 1.9.1 are installed by + # for all versions, so if present, check that the 2.0 version + # is the same as the 2.1, then throw them away. + rm -f debian/tmp/usr/lib/ruby/vendor_ruby/2.0.0/xapian.rb + # The same goes for the docs. Docs for 2.1 are installed by # ruby-xapian.install. - rm -rf debian/tmp/usr/share/doc/xapian-bindings-ruby1.8 \ - debian/tmp/usr/share/doc/xapian-bindings-ruby2.0 + rm -rf debian/tmp/usr/share/doc/xapian-bindings-ruby2.0 endif $(MAKE) -C debian/build/tcl DESTDIR=$(CURDIR)/debian/tmp install @@ -407,12 +403,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 +414,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 -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
