diff -Nru hamlib-1.2.15.3/debian/changelog hamlib-1.2.15.3/debian/changelog --- hamlib-1.2.15.3/debian/changelog 2013-12-30 06:47:04.000000000 +0000 +++ hamlib-1.2.15.3/debian/changelog 2014-07-08 19:13:09.000000000 +0000 @@ -1,26 +1,19 @@ -hamlib (1.2.15.3-1ubuntu4) trusty; urgency=medium +hamlib (1.2.15.3-2~kamal~utopic) utopic; urgency=medium - * Use dh-autoreconf instead of autotools-dev for new libtool. + * Fix "hardcodes /usr/lib/perl5": + - add a patch to make the perl build system respect vendor dirs + - use dynamic perl path from $Config{vendorarch} in debian/rules + (Closes: #752475) [ Thanks, gregor herrmann! ] + * Replace deprecated udev rules ACL_MANAGE method with uaccess method + (Closes: #747036) + * Fix missing libhamlib++-dev Depends: on libhamlib2++c2 (Closes: #715084) + * Replace deprecated dh_pysupport with dh_python2 in debian/rules + * Passed multiarch Tcl location to configure, fixing Ubuntu FTBFS + [ Thanks, Daniel T Chen! ] + * Use dh-autoreconf to update config.{sub,guess} [ Thanks, William Grant! ] + * Bump Standards-version to 3.9.5 - -- William Grant Mon, 30 Dec 2013 06:39:20 +0000 - -hamlib (1.2.15.3-1ubuntu3) trusty; urgency=low - - * Use dh_autotools-dev to update config.{sub,guess} for new ports. - - -- Adam Conrad Mon, 21 Oct 2013 14:00:58 -0600 - -hamlib (1.2.15.3-1ubuntu2) trusty; urgency=low - - * Rebuild for Perl 5.18. - - -- Colin Watson Mon, 21 Oct 2013 13:39:49 +0100 - -hamlib (1.2.15.3-1ubuntu1) raring; urgency=low - - * Passed multiarch Tcl location to configure, fixing FTBFS. - - -- Daniel T Chen Sun, 21 Apr 2013 17:36:01 -0400 + -- Kamal Mostafa Tue, 08 Jul 2014 10:43:00 -0700 hamlib (1.2.15.3-1) unstable; urgency=low diff -Nru hamlib-1.2.15.3/debian/control hamlib-1.2.15.3/debian/control --- hamlib-1.2.15.3/debian/control 2013-12-30 06:47:04.000000000 +0000 +++ hamlib-1.2.15.3/debian/control 2014-07-08 18:33:42.000000000 +0000 @@ -1,12 +1,11 @@ Source: hamlib Section: hamradio Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Debian Hamradio Maintainers +Maintainer: Debian Hamradio Maintainers Uploaders: Kamal Mostafa , Jaime Robles Build-Depends: debhelper (>> 5.0.37.2), pkg-config, doxygen, swig, libperl-dev, python-all-dev (>= 2.3.5-11), tcl8.5-dev, libusb-dev, python-support (>= 0.3), libltdl3-dev, dpkg-dev (>= 1.16.0), dh-autoreconf Build-Conflicts: hamlib-dev (<= 1.2.5-3) -Standards-Version: 3.9.3 +Standards-Version: 3.9.5 XS-Python-Version: >= 2.4 Homepage: http://www.hamlib.org/ @@ -71,7 +70,7 @@ Package: libhamlib++-dev Architecture: any Section: libdevel -Depends: ${misc:Depends}, libhamlib2 (= ${binary:Version}), libhamlib-dev (= ${binary:Version}), libc6-dev +Depends: ${misc:Depends}, libhamlib2++c2 (= ${binary:Version}), libhamlib2 (= ${binary:Version}), libhamlib-dev (= ${binary:Version}), libc6-dev Conflicts: hamlib++-dev Provides: hamlib++-dev Description: Development library to control radio transceivers and receivers diff -Nru hamlib-1.2.15.3/debian/patches/perl-dirs.patch hamlib-1.2.15.3/debian/patches/perl-dirs.patch --- hamlib-1.2.15.3/debian/patches/perl-dirs.patch 1970-01-01 00:00:00.000000000 +0000 +++ hamlib-1.2.15.3/debian/patches/perl-dirs.patch 2014-07-08 17:26:34.000000000 +0000 @@ -0,0 +1,48 @@ +Description: use vendor directories in perl build system +Origin: vendor +Forwarded: no +Author: gregor herrmann +Last-Update: 2014-07-04 + +--- a/bindings/Makefile.am ++++ b/bindings/Makefile.am +@@ -32,7 +32,8 @@ + CC="$(CC)" \ + OBJECT="hamlibperl_wrap.o" \ + VERSION="$(PACKAGE_VERSION)" \ +- LIBS="-L$(top_builddir)/src/.libs -lhamlib" ++ LIBS="-L$(top_builddir)/src/.libs -lhamlib" \ ++ INSTALLDIRS="vendor" + sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk + mv Hamlib-pl-norpath.mk Hamlib-pl.mk + +@@ -52,7 +53,7 @@ + $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck + + install-perl: Hamlib-pl.mk +- $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install_site ++ $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install + + ## ExtUtils::MakeMaker says uninstall is deprecated and won't remove the files + ## anyway, so we'll have to figure out another way to remove the installed files. +--- a/bindings/Makefile.in ++++ b/bindings/Makefile.in +@@ -807,7 +807,8 @@ + CC="$(CC)" \ + OBJECT="hamlibperl_wrap.o" \ + VERSION="$(PACKAGE_VERSION)" \ +- LIBS="-L$(top_builddir)/src/.libs -lhamlib" ++ LIBS="-L$(top_builddir)/src/.libs -lhamlib" \ ++ INSTALLDIRS="vendor" + sed -e 's/^LD_RUN_PATH.*/LD_RUN_PATH =/' Hamlib-pl.mk > Hamlib-pl-norpath.mk + mv Hamlib-pl-norpath.mk Hamlib-pl.mk + +@@ -826,7 +827,7 @@ + $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk distcheck + + install-perl: Hamlib-pl.mk +- $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install_site ++ $(MAKE) $(AM_MAKEFLAGS) -f Hamlib-pl.mk install + + uninstall-perl: ## Hamlib-pl.mk + diff -Nru hamlib-1.2.15.3/debian/patches/series hamlib-1.2.15.3/debian/patches/series --- hamlib-1.2.15.3/debian/patches/series 2012-11-02 19:22:04.000000000 +0000 +++ hamlib-1.2.15.3/debian/patches/series 2014-07-08 18:21:06.000000000 +0000 @@ -0,0 +1 @@ +perl-dirs.patch diff -Nru hamlib-1.2.15.3/debian/rules hamlib-1.2.15.3/debian/rules --- hamlib-1.2.15.3/debian/rules 2013-12-30 06:47:04.000000000 +0000 +++ hamlib-1.2.15.3/debian/rules 2014-07-08 18:35:11.000000000 +0000 @@ -9,7 +9,7 @@ PYVERS=$(shell pyversions -vr) PYDEFAULT=$(shell pyversions -vd) -perlversion = `perl -V:version|cut -d\' -f2` +PERL_ARCHLIB := $(shell perl -MConfig -e 'print $$Config{vendorarch}') # enable hardening flags (for debian/compat<9): configure_flags += $(shell f=`dpkg-buildflags --export=configure` && echo $$f) @@ -70,11 +70,7 @@ install-other: # Move the appropriate files into the perl package and do some cleanups - mv $(CURDIR)/debian/tmp/usr/lib/perl/$(perlversion)/* \ - $(CURDIR)/debian/libhamlib2-perl/usr/lib/perl5 - rm -f $(CURDIR)/debian/libhamlib2-perl/usr/lib/perl5/auto/Hamlib/.packlist - rm -f $(CURDIR)/debian/libhamlib2-perl/usr/lib/perl5/auto/Hamlib/Hamlib.bs - rm -f $(CURDIR)/debian/libhamlib2-perl/usr/lib/perl5/perllocal.pod + dh_install -plibhamlib2-perl --sourcedir=$(CURDIR)/debian/tmp $(PERL_ARCHLIB) cp $(CURDIR)/bindings/perltest.pl \ $(CURDIR)/debian/libhamlib2-perl/usr/share/doc/libhamlib2-perl/ # libhamlib2, libhamlib-dev, libhamlib2++c2, libhamlib++-dev, @@ -125,7 +121,7 @@ fi; \ done - dh_pysupport -ppython-libhamlib2 + dh_python2 -ppython-libhamlib2 dh_makeshlibs -a -V -Xalinco -Xaor -Xdrake -Xdummy -Xeasycomm -Xflexradio \ -Xfodtrack -Xgs232a -Xicom -Xjrc -Xkachina -Xkenwood -Xkit -Xlowe \ -Xmicrotune -Xpcr -Xracal -Xrft -Xrotorez -Xrpc -Xsartek -Xskanti \ diff -Nru hamlib-1.2.15.3/debian/udev-rules/59-hamlib.rules hamlib-1.2.15.3/debian/udev-rules/59-hamlib.rules --- hamlib-1.2.15.3/debian/udev-rules/59-hamlib.rules 2012-03-11 21:17:48.000000000 +0000 +++ hamlib-1.2.15.3/debian/udev-rules/59-hamlib.rules 2014-07-08 17:31:55.000000000 +0000 @@ -1,12 +1,12 @@ # -# Enable ACL_MANAGE for common embedded USB-serial converters so that +# Enable uaccess for common embedded USB-serial converters so that # applications which call usb_detach_kernel_driver_np() won't need sudo. # # This file was installed by the package 'libhamlib2' # FTDI USB Serial Device converter -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", ENV{ACL_MANAGE}="1" +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="0403", ATTR{idProduct}=="6001", TAG+="uaccess" # VOTI USBasp AVR Programmer -ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="05dc", ENV{ACL_MANAGE}="1" +ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="16c0", ATTR{idProduct}=="05dc", TAG+="uaccess"