Bug#746495: xapian-bindings: diff for NMU version 1.2.17-1.1

2014-05-02 Thread Christian Hofstaedtler 
* Olly Betts  [140502 11:49]:
> On Fri, May 02, 2014 at 10:53:00AM +0200, Christian Hofstaedtler wrote:
> > * Christian Hofstaedtler  [140501 02:30]:
> > > I also certainly see why it'd be better if you'd do the upload
> > > instead of my NMU -- I didn't feel comfortable with the diff.
> > 
> > So... should I cancel that NMU?
> 
> I think that's best - I should be able to sort this out over the
> weekend.

Alright, cancelled.

Thanks,
  -ch

-- 
 ,''`.  Christian Hofstaedtler 
: :' :  Debian Developer
`. `'   7D1A CFFA D9E0 806C 9C4C  D392 5C13 D6DB 9305 2E03
  `-



pgpVwH_JzAXSt.pgp
Description: PGP signature

Bug#746495: xapian-bindings: diff for NMU version 1.2.17-1.1

2014-05-02 Thread Olly Betts 
On Fri, May 02, 2014 at 10:53:00AM +0200, Christian Hofstaedtler wrote:
> * Christian Hofstaedtler  [140501 02:30]:
> > I also certainly see why it'd be better if you'd do the upload
> > instead of my NMU -- I didn't feel comfortable with the diff.
> 
> So... should I cancel that NMU?

I think that's best - I should be able to sort this out over the
weekend.

Cheers,
Olly


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#746495: xapian-bindings: diff for NMU version 1.2.17-1.1

2014-05-02 Thread Christian Hofstaedtler 
* Christian Hofstaedtler  [140501 02:30]:
> I also certainly see why it'd be better if you'd do the upload
> instead of my NMU -- I didn't feel comfortable with the diff.

So... should I cancel that NMU?

Thanks,
  -ch

-- 
 ,''`.  Christian Hofstaedtler 
: :' :  Debian Developer
`. `'   7D1A CFFA D9E0 806C 9C4C  D392 5C13 D6DB 9305 2E03
  `-



pgpCGSUSG9677.pgp
Description: PGP signature

Bug#746495: xapian-bindings: diff for NMU version 1.2.17-1.1

2014-04-30 Thread Christian Hofstaedtler 
* Olly Betts  [140501 00:02]:
> On Wed, Apr 30, 2014 at 05:09:00PM +0200, Christian Hofstaedtler wrote:
> > 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.]
> 
> A DELAYED/3 NMU for a 4 day old bug seems rather impatient.
> 
> This bug is already on my list to deal with, but I'm a bit backlogged
> after being away last week.  How urgent is this?  I'd rather not have
> to deal with fall-out from a bad NMU on top of everything else I have
> to do.
> 
> I tried to look at the transition tracker to get an idea, but it
> shows xapian-bindings as "good" already:
> 
> https://release.debian.org/transitions/html/ruby1.9.1-rm.html

I don't know why it does that, but it's wrong.

`dak rm -s testing ruby1.9.1` still shows that xapian-bindings would
need to go, but given the list of rdepends it really needs fixing.

Given that the transition tracker is wrong on this, it hasn't been
noticed early enough, and I expect that in 3 days all packages that
would block the removal are at least in sid, plus on their good way
into testing.
IIRC (excluding xapian-bindings) we should reach a "good" state in
jessie on 5th or 6th of May.

If you want, I can certainly cancel the DELAYED upload, but I really
want to see this [the ruby parts] fixed ASAP.

I also certainly see why it'd be better if you'd do the upload
instead of my NMU -- I didn't feel comfortable with the diff.


Thank you,
  -ch

-- 
 ,''`.  Christian Hofstaedtler 
: :' :  Debian Developer
`. `'   7D1A CFFA D9E0 806C 9C4C  D392 5C13 D6DB 9305 2E03
  `-



pgpeQxO4UYqWt.pgp
Description: PGP signature

Bug#746495: xapian-bindings: diff for NMU version 1.2.17-1.1

2014-04-30 Thread Olly Betts 
On Wed, Apr 30, 2014 at 05:09:00PM +0200, Christian Hofstaedtler wrote:
> 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.]

A DELAYED/3 NMU for a 4 day old bug seems rather impatient.

This bug is already on my list to deal with, but I'm a bit backlogged
after being away last week.  How urgent is this?  I'd rather not have
to deal with fall-out from a bad NMU on top of everything else I have
to do.

I tried to look at the transition tracker to get an idea, but it
shows xapian-bindings as "good" already:

https://release.debian.org/transitions/html/ruby1.9.1-rm.html

Cheers,
Olly


-- 
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org

Bug#746495: xapian-bindings: diff for NMU version 1.2.17-1.1

2014-04-30 Thread Christian Hofstaedtler 
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.0 
+0100
+++ xapian-bindings-1.2.17/debian/changelog 2014-04-30 16:58:40.0 
+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  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
+.
+  * Apply patch to fix build on ppc64el from Matthias Klose
+.
+
+  [ Matthias Klose ]
+  * Fix the binary-indep build.
+  * Explicitely use automake1.11.
+  * Build using dh-autoreconf. (Closes: #746239)
+
+ -- Christian Hofstaedtler   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.0 
+0100
+++ xapian-bindings-1.2.17/debian/control   2014-04-30 17:02:37.0 
+0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Olly Betts 
 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.in2014-01-24 02:50:09.0 
+0100
+++ xapian-bindings-1.2.17/debian/control.in2014-04-30 16:59:59.0 
+0200
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Olly Betts 
 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.0 +0100
+++ xapian-bindings-1.2.17/debian/control-ruby-new.in   2014-04-30 
16:36:25.0 +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.0 +0100
+++ xapian-bindings-1.2.17/debian/ruby-xapian.install   2014-04-30 
17:02:37.0 +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/