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

[Jackson Doak]

Merge from debian

[Martin Pitt (pitti)]

Thanks! Uploaded.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2014-06-10 07:20:43 +0000
+++ debian/changelog	2014-07-31 21:35:45 +0000
@@ -1,3 +1,22 @@
+obexftp (0.23-3ubuntu1) UNRELEASED; 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]>  Thu, 31 Jul 2014 06:10:53 +1000
+
+obexftp (0.23-3) unstable; urgency=medium
+
+  * QA upload.
+  * Fix "hardcodes /usr/lib/perl5":
+    dynamically set perl library path in debian/rules from $Config{vendorarch}
+    (Closes: #752799)
+  * Add missing license to debian/copyright.
+    (Closes: #750564)
+
+ -- gregor herrmann <[e-mail]>  Tue, 29 Jul 2014 19:51:27 +0200
+
 obexftp (0.23-2ubuntu1) utopic; urgency=medium
 
   * Merge from Debian unstable. Remaining changes:

=== modified file 'debian/copyright'
--- debian/copyright	2008-10-25 16:28:12 +0000
+++ debian/copyright	2014-07-31 21:35:45 +0000
@@ -25,6 +25,25 @@
    Free Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
    MA 02110-1301, USA.
 
-
 On Debian GNU/Linux systems, the complete text of the GNU General
 Public License can be found in `/usr/share/common-licenses/GPL-2'.
+
+
+License for bfb/* and obexftp/*:
+
+	ObexFTP is free software; you can redistribute it and/or modify
+	it under the terms of the GNU Lesser General Public License as
+	published by the Free Software Foundation; either version 2 of
+	the License, or (at your option) any later version.
+
+	This program is distributed in the hope that it will be useful,
+	but WITHOUT ANY WARRANTY; without even the implied warranty of
+	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+	GNU Lesser General Public License for more details.
+
+	You should have received a copy of the GNU Lesser General Public
+	License along with ObexFTP. If not, see <http://www.gnu.org/>.
+
+
+On Debian GNU/Linux systems, the complete text of the GNU Lesser General
+Public License can be found in `/usr/share/common-licenses/LGPL-2'.

=== removed file 'debian/libobexftp-perl.install'
--- debian/libobexftp-perl.install	2008-10-25 16:28:12 +0000
+++ debian/libobexftp-perl.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/perl5/*

=== added file 'debian/libobexftp-perl.install.in'
--- debian/libobexftp-perl.install.in	1970-01-01 00:00:00 +0000
+++ debian/libobexftp-perl.install.in	2014-07-31 21:35:45 +0000
@@ -0,0 +1,1 @@
+@PERL_ARCHLIB@/*

=== modified file 'debian/rules'
--- debian/rules	2014-06-10 07:20:43 +0000
+++ debian/rules	2014-07-31 21:35:45 +0000
@@ -63,6 +63,8 @@
 CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
+PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}')
+
 include /usr/share/quilt/quilt.make
 
 config.status: configure $(QUILT_STAMPFN)
@@ -88,6 +90,7 @@
 	rm -f build-stamp
 	debian/rules unpatch
 	rm -rf doc/api
+	rm -f debian/libobexftp-perl.install
 	$(MAKE) -C doc clean || true
 	$(MAKE) distclean || true
 	rm -f swig/python/__init__.py[co]
@@ -109,6 +112,7 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
+	sed -e 's;@PERL_ARCHLIB@;$(PERL_ARCHLIB);g;' $(CURDIR)/debian/libobexftp-perl.install.in > $(CURDIR)/debian/libobexftp-perl.install
 	dh_install --sourcedir=debian/tmp --autodest --fail-missing -X.la
 	dh_installdocs -XCOPYING -XINSTALL -Xobexftp.1
 	dh_installman
@@ -120,7 +124,7 @@
 	dh_strip
 
 ifeq ($(COMPILE_PERL_BINDING),yes)
-	find $(CURDIR)/debian/*/usr/lib/perl5 -name *.so -type f -exec chrpath -d {} \;
+	find $(CURDIR)/debian/*/$(PERL_ARCHLIB) -name *.so -type f -exec chrpath -d {} \;
 #run it again to make sure that permissions are correct
 	dh_fixperms
 	dh_perl -plibobexftp-perl