Benjamin Drung <bdr...@debian.org> writes: > Am Sonntag, den 17.06.2012, 13:08 +0200 schrieb Julien Cristau: >> I've prepared an NMU for xmms2 (versioned as 0.8+dfsg-2.1) and >> uploaded it to DELAYED/2. Please feel free to tell me if I >> should delay it longer. > > Dropping the ruby package seems to be the wrong fix. xmms2 fails to > build due to the ruby switch to version 1.9 as default. The correct > solution is probably to contact the ruby team and get the ruby part of > the package updated to follow the latest ruby specs.
The attached patch solve the FTBS, but I don't know if I don't miss something as my ruby & xmms apps are only half working with this (https://github.com/vanicat/xmms-gtk-rater). By the way Benjamin, do you need help for maintaining xmms2 ? If yes, I could help, being a Debian developer interested by xmms2. That said I'm not a very active developer. Julien, could you delay the nmu more for a less intrusive patch to be found? Thanks.
diff -Nru xmms2-0.8+dfsg/debian/changelog xmms2-0.8+dfsg/debian/changelog --- xmms2-0.8+dfsg/debian/changelog 2012-02-07 17:18:39.000000000 +0100 +++ xmms2-0.8+dfsg/debian/changelog 2012-06-17 14:44:27.000000000 +0200 @@ -1,3 +1,9 @@ +xmms2 (0.8+dfsg-2.1) UNRELEASED; urgency=low + + * depend on ruby1.8 + + -- Rémi Vanicat <vani...@debian.org> Sun, 17 Jun 2012 14:34:57 +0200 + xmms2 (0.8+dfsg-2) unstable; urgency=low * Unpack waf binary (following http://wiki.debian.org/UnpackWaf) diff -Nru xmms2-0.8+dfsg/debian/control xmms2-0.8+dfsg/debian/control --- xmms2-0.8+dfsg/debian/control 2012-02-07 17:16:51.000000000 +0100 +++ xmms2-0.8+dfsg/debian/control 2012-06-17 20:30:59.000000000 +0200 @@ -46,7 +46,8 @@ python-all-dev (>= 2.6.6-3~), python-pyrex, ruby, - ruby1.8-dev + ruby1.9.1, + ruby1.9.1-dev Vcs-Git: git://git.debian.org/git/pkg-xmms2/xmms2 Vcs-Browser: http://git.debian.org/?p=pkg-xmms2/xmms2.git Homepage: http://xmms2.org/ @@ -172,7 +173,7 @@ Package: libxmmsclient-ruby Architecture: all Section: ruby -Depends: libxmmsclient-ruby1.8, ruby, ${misc:Depends} +Depends: libxmmsclient-ruby1.9.1, ruby, ${misc:Depends} Description: XMMS2 - Ruby client library XMMS2 is a redesign of the XMMS music player. It features a client-server model, allowing multiple (even simultaneous!) user interfaces, both textual @@ -185,10 +186,10 @@ This package is an empty dummy package that always depends on a package built for Debian's default Ruby version. -Package: libxmmsclient-ruby1.8 +Package: libxmmsclient-ruby1.9.1 Architecture: any Section: ruby -Depends: ruby1.8, ${misc:Depends}, ${shlibs:Depends} +Depends: ruby1.9.1, ${misc:Depends}, ${shlibs:Depends} Description: XMMS2 - Ruby bindings XMMS2 is a redesign of the XMMS music player. It features a client-server model, allowing multiple (even simultaneous!) user interfaces, both textual @@ -198,7 +199,7 @@ This package contains a Ruby library that allows you to write XMMS2 clients. It's a language binding of libxmmsclient0. . - This package is compiled for Ruby 1.8. + This package is compiled for Ruby 1.9.1. Package: libxmmsclient6 Architecture: any diff -Nru xmms2-0.8+dfsg/debian/libxmmsclient-ruby1.8.install xmms2-0.8+dfsg/debian/libxmmsclient-ruby1.8.install --- xmms2-0.8+dfsg/debian/libxmmsclient-ruby1.8.install 2012-02-07 17:11:28.000000000 +0100 +++ xmms2-0.8+dfsg/debian/libxmmsclient-ruby1.8.install 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/lib/ruby/1.8/* diff -Nru xmms2-0.8+dfsg/debian/libxmmsclient-ruby1.9.1.install xmms2-0.8+dfsg/debian/libxmmsclient-ruby1.9.1.install --- xmms2-0.8+dfsg/debian/libxmmsclient-ruby1.9.1.install 1970-01-01 01:00:00.000000000 +0100 +++ xmms2-0.8+dfsg/debian/libxmmsclient-ruby1.9.1.install 2012-06-17 20:38:17.000000000 +0200 @@ -0,0 +1 @@ +usr/lib/ruby/1.9.1/* diff -Nru xmms2-0.8+dfsg/debian/rules xmms2-0.8+dfsg/debian/rules --- xmms2-0.8+dfsg/debian/rules 2012-02-07 17:22:13.000000000 +0100 +++ xmms2-0.8+dfsg/debian/rules 2012-06-17 20:31:44.000000000 +0200 @@ -4,6 +4,7 @@ PYVERSIONS := $(shell pyversions -s) VENDOR ?= $(shell if dpkg-vendor --is Ubuntu || dpkg-vendor --derives-from Ubuntu; then echo "Ubuntu"; else echo "Debian"; fi) +RUBY = /usr/bin/ruby1.9.1 ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) @@ -34,8 +35,8 @@ ./waf configure $(WAFFLAGS) \ --with-perl-archdir=$(shell /usr/bin/perl -MConfig -le'print $$Config{vendorarch}') \ --with-perl-binary=/usr/bin/perl \ - --with-ruby-archdir=$(shell ruby1.8 -rrbconfig -e'print Config::CONFIG["archdir"]') \ - --with-ruby-libdir=$(shell ruby1.8 -rrbconfig -e'print Config::CONFIG["rubylibdir"]') \ + --with-ruby-archdir=$(shell ruby1.9.1 -rrbconfig -e'print Config::CONFIG["archdir"]') \ + --with-ruby-libdir=$(shell ruby1.9.1 -rrbconfig -e'print Config::CONFIG["rubylibdir"]') \ --without-optionals=et,python $(additional_wafflags) mv _build_ _build_without_python_ $(foreach pyversion,$(PYVERSIONS),\
-- Rémi Vanicat
