tags 739777 + patch tags 739777 + pending thanks Dear maintainer,
I've prepared an NMU for obexftp (versioned as 0.23-1.3) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards.
diff -u obexftp-0.23/debian/rules obexftp-0.23/debian/rules --- obexftp-0.23/debian/rules +++ obexftp-0.23/debian/rules @@ -41,6 +42,7 @@ ifeq ($(COMPILE_RUBY_BINDING),yes) bindings_configure_flags += --enable-ruby compile_shared_libs=yes + rubyvendorarchdir=$(shell ruby -e "puts RbConfig::CONFIG['vendorarchdir']") else bindings_configure_flags += --disable-ruby endif @@ -95,13 +97,7 @@ dh_testroot dh_prep dh_installdirs - $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp mandir=/usr/share/man INSTALLDIRS=vendor - -ifeq ($(COMPILE_RUBY_BINDING),yes) - -rm -rf debian/tmp/usr/lib/ruby - mv debian/tmp/usr/local/lib/site_ruby debian/tmp/usr/lib/ruby - rm -rf debian/tmp/usr/local/ -endif + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp mandir=/usr/share/man INSTALLDIRS=vendor sitearchdir=$(rubyvendorarchdir) # Build architecture-independent files here. binary-indep: build install diff -u obexftp-0.23/debian/changelog obexftp-0.23/debian/changelog --- obexftp-0.23/debian/changelog +++ obexftp-0.23/debian/changelog @@ -1,3 +1,15 @@ +obexftp (0.23-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS with multiarched Ruby interpreters (Closes: #739777) + - pass vendorarchdir for the path installation of Ruby bindings + - do not explicitly touch the path of Ruby libraries in debian/rules, as + the library gets installed at right place in the first place. + - change path in debian/libobexftp-ruby.install to leave space for the + architecture name. + + -- Cédric Boutillier <bou...@debian.org> Wed, 23 Apr 2014 15:09:07 +0200 + obexftp (0.23-1.2) unstable; urgency=low * Non-maintainer upload. diff -u obexftp-0.23/debian/libobexftp-ruby.install obexftp-0.23/debian/libobexftp-ruby.install --- obexftp-0.23/debian/libobexftp-ruby.install +++ obexftp-0.23/debian/libobexftp-ruby.install @@ -1 +1 @@ -usr/lib/ruby/* +usr/lib/*/ruby/*
signature.asc
Description: Digital signature
