Merge lp:~noskcaj/ubuntu/utopic/obexftp/merge into lp:ubuntu/utopic/obexftp

[Jackson Doak]

Merge from debian.

[Daniel Holbach (dholbach)]

Thanks. Uploaded.

review: Approve

Unmerged revisions

17. By Jackson Doak on 2014-06-09

* Merge from Debian unstable. Remaining changes:
  - Fix build failure, using StringValuePtr instead of STR2CSTR.

=== added directory '.pc'
=== added file '.pc/.quilt_patches'
--- .pc/.quilt_patches	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_patches	2014-06-09 21:49:13 +0000
@@ -0,0 +1,1 @@
+debian/patches
 
=== added file '.pc/.quilt_series'
--- .pc/.quilt_series	1970-01-01 00:00:00 +0000
+++ .pc/.quilt_series	2014-06-09 21:49:13 +0000
@@ -0,0 +1,1 @@
+series
 
=== added file '.pc/.version'
--- .pc/.version	1970-01-01 00:00:00 +0000
+++ .pc/.version	2014-06-09 21:49:13 +0000
@@ -0,0 +1,1 @@
+2
 
=== modified file 'debian/changelog'
--- debian/changelog	2013-10-21 11:56:11 +0000
+++ debian/changelog	2014-06-09 21:49:13 +0000
@@ -1,3 +1,35 @@
+obexftp (0.23-2ubuntu1) utopic; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Fix build failure, using StringValuePtr instead of STR2CSTR.
+  * Use dh-autoreconf instead of dh-autotools-dev
+
+ -- Jackson Doak <[e-mail]>  Tue, 10 Jun 2014 07:20:43 +1000
+
+obexftp (0.23-2) unstable; urgency=medium
+
+  * QA upload.
+  * Set Maintainer to Debian QA Group
+  * Prefix installation path (sitearchdir) for the Ruby library with DESTDIR,
+    so that ruby2.1 does not try to install in a location relative to /
+    (Closes: #747826)
+  * Rename libobexftp-ruby to ruby-obexftp, keep a transitional package to
+    ease the upgrade process (Closes: #722390)
+
+ -- Cédric Boutillier <[e-mail]>  Fri, 30 May 2014 23:19:18 +0200
+
+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 <[e-mail]>  Wed, 23 Apr 2014 15:09:07 +0200
+
 obexftp (0.23-1.2ubuntu3) trusty; urgency=low
 
   * Use dh_autotools-dev to update config.{sub,guess} for new ports.
 
=== modified file 'debian/control'
--- debian/control	2013-10-21 11:56:11 +0000
+++ debian/control	2014-06-09 21:49:13 +0000
@@ -2,8 +2,8 @@
 Section: comm
 Priority: optional
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer: Hendrik Sattler <[e-mail]>
-Build-Depends: debhelper (>= 7.0.0), libopenobex1-dev (>= 1.3-3), libbluetooth-dev, quilt (>= 0.45), pkg-config, swig, doxygen, python-dev (>= 2.6.6-3~), ruby-dev, ruby, chrpath, autotools-dev
+XSBC-Original-Maintainer: Debian QA Group <[e-mail]>
+Build-Depends: debhelper (>= 7.0.0), libopenobex1-dev (>= 1.3-3), libbluetooth-dev, quilt (>= 0.45), pkg-config, swig, doxygen, python-dev (>= 2.6.6-3~), ruby-dev, ruby, chrpath, dh-autoreconf
 Standards-Version: 3.8.3
 Homepage: http://triq.net/obex
 
@@ -114,10 +114,13 @@
  .
  This package contains the binding for the Python programming language.
 
-Package: libobexftp-ruby
+Package: ruby-obexftp
 Architecture: any
 Section: ruby
 Depends: libobexftp0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
+Breaks: libobexftp-ruby (<< 0.23-2~)
+Replaces: libobexftp-ruby (<< 0.23-2~)
+Provides: libobexftp-ruby
 Description: ruby binding to the object exchange file transfer library
  OBEX, the OBject EXchange protocol, can best be described as binary HTTP.
  OBEX is optimized for ad-hoc links and can be used to exchange
@@ -127,6 +130,15 @@
  .
  This package contains the binding for the Ruby programming language.
 
+Package: libobexftp-ruby
+Section: oldlibs
+Architecture: all
+Priority: extra
+Description: Transitional package for ruby-obexftp
+ This is a transitional package to ease upgrades to ruby-obexftp package.
+ It can safely be removed.
+
+
 Package: libobexftp-perl
 Architecture: any
 Section: perl
 
=== removed file 'debian/libobexftp-ruby.install'
--- debian/libobexftp-ruby.install	2008-10-25 16:28:12 +0000
+++ debian/libobexftp-ruby.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/ruby/*
 
=== added file 'debian/ruby-obexftp.install'
--- debian/ruby-obexftp.install	1970-01-01 00:00:00 +0000
+++ debian/ruby-obexftp.install	2014-06-09 21:49:13 +0000
@@ -0,0 +1,1 @@
+usr/lib/*/ruby/*
 
=== modified file 'debian/rules'
--- debian/rules	2013-10-21 11:56:11 +0000
+++ debian/rules	2014-06-09 21:49:13 +0000
@@ -41,6 +41,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
@@ -66,7 +67,7 @@
 
 config.status: configure $(QUILT_STAMPFN)
 	dh_testdir
-	dh_autotools-dev_updateconfig
+	dh_autoreconf
 	CFLAGS="$(CFLAGS)" ./configure $(CROSS) \
 	            --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info \
 	            $(bindings_configure_flags) \
@@ -83,7 +84,7 @@
 clean:
 	dh_testdir
 	dh_testroot
-	dh_autotools-dev_restoreconfig
+	dh_autoreconf_clean
 	rm -f build-stamp
 	debian/rules unpatch
 	rm -rf doc/api
@@ -97,13 +98,8 @@
 	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
+	#sitearchdir needs to be prefixed with $(DESTDIR) with ruby2.1
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp mandir=/usr/share/man INSTALLDIRS=vendor sitearchdir=$(CURDIR)/debian/tmp/$(rubyvendorarchdir)
 
 # Build architecture-independent files here.
 binary-indep: build install
@@ -137,7 +133,7 @@
 endif
 
 ifeq ($(COMPILE_RUBY_BINDING),yes)
-	dh_installexamples -plibobexftp-ruby examples/ruby_*.rb
+	dh_installexamples -pruby-obexftp examples/ruby_*.rb
 endif
 
 ifeq ($(COMPILE_TCL_BINDING),yes)