tags 730719 + patch
tags 730719 + pending
thanks
Dear maintainer,
I've prepared an NMU for xmms2 (versioned as 0.8+dfsg-8.1) and
uploaded it to DELAYED/7. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru xmms2-0.8+dfsg/debian/changelog xmms2-0.8+dfsg/debian/changelog
--- xmms2-0.8+dfsg/debian/changelog 2013-10-16 14:55:20.000000000 +0200
+++ xmms2-0.8+dfsg/debian/changelog 2014-01-15 14:06:23.000000000 +0100
@@ -1,3 +1,11 @@
+xmms2 (0.8+dfsg-8.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Build for supported versions of Ruby. (Closes: #730719)
+ * Drop transitional packages libxmmsclient0-ruby, libxmmsclient0-ruby1.8.
+
+ -- Christian Hofstaedtler <z...@debian.org> Wed, 15 Jan 2014 14:04:54 +0100
+
xmms2 (0.8+dfsg-8) unstable; urgency=low
* Tell waf to use pkg-config to find smbclient.h, thanks to
diff -Nru xmms2-0.8+dfsg/debian/control xmms2-0.8+dfsg/debian/control
--- xmms2-0.8+dfsg/debian/control 2013-10-16 14:22:57.000000000 +0200
+++ xmms2-0.8+dfsg/debian/control 2014-01-15 13:44:32.000000000 +0100
@@ -47,10 +47,7 @@
python-all-dev (>= 2.6.6-3~),
python-pyrex,
ruby | ruby-interpreter,
- ruby1.8,
- ruby1.8-dev,
- ruby1.9.1,
- ruby1.9.1-dev
+ gem2deb
Vcs-Git: git://anonscm.debian.org/pkg-xmms2/xmms2
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-xmms2/xmms2.git
Homepage: http://xmms2.org/
@@ -173,29 +170,10 @@
.
This package contains a glib based client library written in c.
-Package: libxmmsclient-ruby
-Architecture: all
-Section: oldlibs
-Priority: extra
-Depends: ruby-xmmsclient, ${misc:Depends}
-Description: Transitional package for ruby-xmmsclient
- This is a transitional package to ease upgrades to the ruby-xmmsclient
- package. It can safely be removed.
-
-Package: libxmmsclient-ruby1.8
-Architecture: all
-Section: oldlibs
-Priority: extra
-Depends: ruby1.8, ${misc:Depends}
-Description: Transitional package for ruby-xmmsclient
- This is a transitional package to ease upgrades to the ruby-xmmsclient
- package. It can safely be removed.
-
Package: ruby-xmmsclient
Architecture: any
Section: ruby
Depends: ruby | ruby-interpreter, ${misc:Depends}, ${shlibs:Depends}
-Replaces: libxmmsclient-ruby1.8 (<< 0.8+dfsg-4)
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
diff -Nru xmms2-0.8+dfsg/debian/patches/ruby2-multiarch.patch
xmms2-0.8+dfsg/debian/patches/ruby2-multiarch.patch
--- xmms2-0.8+dfsg/debian/patches/ruby2-multiarch.patch 1970-01-01
01:00:00.000000000 +0100
+++ xmms2-0.8+dfsg/debian/patches/ruby2-multiarch.patch 2014-01-15
13:56:04.000000000 +0100
@@ -0,0 +1,26 @@
+Index: xmms2-0.8+dfsg/waflib/Tools/ruby.py
+===================================================================
+--- xmms2-0.8+dfsg.orig/waflib/Tools/ruby.py 2014-01-15 13:45:45.695654979
+0100
++++ xmms2-0.8+dfsg/waflib/Tools/ruby.py 2014-01-15 13:56:00.184162150
+0100
+@@ -49,10 +49,13 @@ def check_ruby_ext_devel(self):
+ ruby=self.env['RUBY']
+ archdir=read_config('archdir')
+ cpppath=archdir
+- if version>=(1,9,0):
++ if version>=(1,9,0) or version[0]>=2:
+ ruby_hdrdir=read_config('rubyhdrdir')
+ cpppath+=ruby_hdrdir
+ cpppath+=[os.path.join(ruby_hdrdir[0],read_config('arch')[0])]
++ if version[0]>=2:
++ ruby_archhdrdir=read_config('rubyarchhdrdir')
++ cpppath+=ruby_archhdrdir
+ self.check(header_name='ruby.h',includes=cpppath,errmsg='could not find
ruby header file')
+ self.env.LIBPATH_RUBYEXT=read_config('libdir')
+ self.env.LIBPATH_RUBYEXT+=archdir
+@@ -85,4 +88,4 @@ before_method('apply_incpaths','apply_li
+ feature('rubyext')(apply_ruby_so_name)
+ before_method('apply_link','propagate_uselib')(apply_ruby_so_name)
+ conf(check_ruby_version)
+-conf(check_ruby_ext_devel)
+\ No newline at end of file
++conf(check_ruby_ext_devel)
diff -Nru xmms2-0.8+dfsg/debian/patches/series
xmms2-0.8+dfsg/debian/patches/series
--- xmms2-0.8+dfsg/debian/patches/series 2013-10-16 14:31:41.000000000
+0200
+++ xmms2-0.8+dfsg/debian/patches/series 2014-01-15 13:44:07.000000000
+0100
@@ -11,3 +11,4 @@
hardening-flags.patch
fix-libmodplug-include.patch
samba-with-pkg-cfg.patch
+ruby2-multiarch.patch
diff -Nru xmms2-0.8+dfsg/debian/ruby-xmmsclient.install
xmms2-0.8+dfsg/debian/ruby-xmmsclient.install
--- xmms2-0.8+dfsg/debian/ruby-xmmsclient.install 2012-12-01
10:45:24.000000000 +0100
+++ xmms2-0.8+dfsg/debian/ruby-xmmsclient.install 2014-01-15
14:09:35.000000000 +0100
@@ -1 +1,2 @@
usr/lib/ruby/vendor_ruby/*
+usr/lib/*/ruby/vendor_ruby/*
diff -Nru xmms2-0.8+dfsg/debian/rules xmms2-0.8+dfsg/debian/rules
--- xmms2-0.8+dfsg/debian/rules 2013-09-24 10:51:01.000000000 +0200
+++ xmms2-0.8+dfsg/debian/rules 2014-01-15 13:45:11.000000000 +0100
@@ -3,7 +3,7 @@
export NOCOLOR=1
PYVERSIONS := $(shell pyversions -s)
-RUBYVERSIONS := ruby1.8 ruby1.9.1
+RUBYVERSIONS := $(shell dh_ruby --print-supported)
VENDOR ?= $(shell if dpkg-vendor --is Ubuntu || dpkg-vendor --derives-from
Ubuntu; then echo "Ubuntu"; else echo "Debian"; fi)
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
--
To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
