UbuntuDiff: Available patches from Ubuntu

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | ^txt | LP | Bugs ) | Diff from Ubuntu

Source: pcsc-lite

pcsc-lite (1.7.4-2ubuntu2) precise; urgency=low * Install into multiarch locations. LP: #949912. -- Matthias Klose <doko@ubuntu.com> Wed, 04 Apr 2012 10:00:42 +0200 pcsc-lite (1.7.4-2ubuntu1) precise; urgency=low * Merge with Debian testing. Remaining Ubuntu changes: - debian/rules: Move runtime libraries to /lib, for the benefit of wpasupplicant. (See Debian #531592) -- Martin Pitt <martin.pitt@ubuntu.com> Wed, 19 Oct 2011 15:43:44 +0200

Modifications :

debian/rules

--- 1.7.4-2/debian/rules 2011-06-22 14:33:17.000000000 +0000 +++ 1.7.4-2ubuntu2/debian/rules 2012-04-04 08:09:58.000000000 +0000 @@ -1,6 +1,7 @@ #!/usr/bin/make -f DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) ifeq ($(DEB_HOST_ARCH_OS),hurd) EXTRA_CONFIGURE_ARGS += --disable-usb endif @@ -10,3 +11,17 @@ endif override_dh_auto_configure: dh_auto_configure -- $(EXTRA_CONFIGURE_ARGS) + +override_dh_install: + dh_install --sourcedir=debian/tmp + # move runtime libraries to /lib/<multiarch> + mkdir -p debian/libpcsclite1/lib/$(DEB_HOST_MULTIARCH) + mkdir -p debian/libpcsclite-dev/usr/lib/$(DEB_HOST_MULTIARCH) + mv debian/libpcsclite1/usr/lib/libpcsclite.so.1* \ + debian/libpcsclite1/lib/$(DEB_HOST_MULTIARCH) + rmdir -p --ignore-fail-on-non-empty debian/libpcsclite1/usr/lib + ln -sf /lib/$(DEB_HOST_MULTIARCH)/$$(readlink debian/libpcsclite-dev/usr/lib/libpcsclite.so) \ + debian/libpcsclite-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libpcsclite.so + rm -f debian/libpcsclite-dev/usr/lib/libpcsclite.so + mv debian/libpcsclite-dev/usr/lib/libpcsclite.la debian/libpcsclite-dev/usr/lib/$(DEB_HOST_MULTIARCH)/. + mv debian/libpcsclite-dev/usr/lib/pkgconfig debian/libpcsclite-dev/usr/lib/$(DEB_HOST_MULTIARCH)/.
debian/control

--- 1.7.4-2/debian/control 2011-08-27 16:47:55.000000000 +0000 +++ 1.7.4-2ubuntu2/debian/control 2012-04-04 08:03:14.000000000 +0000 @@ -1,7 +1,8 @@ Source: pcsc-lite Section: misc Priority: optional -Maintainer: Ludovic Rousseau <rousseau@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com> +XSBC-Original-Maintainer: Ludovic Rousseau <rousseau@debian.org> Build-Depends: debhelper (>= 7.0.50~), flex, autotools-dev, libudev-dev [linux-any], libusb2-dev [kfreebsd-any], pkg-config Standards-Version: 3.9.2 Vcs-Svn: svn://svn.debian.org/svn/collab-maint/deb-maint/pcsc-lite/trunk @@ -22,6 +23,7 @@ Description: Middleware to access a smar Package: libpcsclite-dev Section: libdevel Architecture: any +Multi-Arch: same Depends: libpcsclite1 (= ${binary:Version}), ${misc:Depends} Description: Middleware to access a smart card using PC/SC (development files) The purpose of PC/SC Lite is to provide a Windows(R) SCard interface @@ -35,7 +37,9 @@ Description: Middleware to access a smar Package: libpcsclite1 Section: libs Architecture: any +Multi-Arch: same Conflicts: libpcsclite-dev (<< ${binary:Version}) +Pre-Depends: multiarch-support Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: pcscd (= ${binary:Version}) Breaks: pcscd (<< ${binary:Version})

Debian ( Changelog | PTS | Bugs ) Ubuntu ( Changelog | ^txt | LP | Bugs ) | Diff from Ubuntu

Source: pilot-link

pilot-link (0.12.5-4ubuntu1) precise; urgency=low * Build using dh_python2 -- Matthias Klose <doko@ubuntu.com> Sat, 17 Dec 2011 13:29:29 +0000 pilot-link (0.12.5-4build1) precise; urgency=low * Rebuild for Perl 5.14. -- Colin Watson <cjwatson@ubuntu.com> Wed, 16 Nov 2011 00:37:26 +0000

Modifications :

debian/pycompat

--- 0.12.5-4/debian/pycompat 2009-03-07 13:58:00.000000000 +0000 +++ 0.12.5-4ubuntu1/debian/pycompat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -2
debian/rules

--- 0.12.5-4/debian/rules 2011-07-17 15:13:11.000000000 +0000 +++ 0.12.5-4ubuntu1/debian/rules 2011-12-17 13:46:01.000000000 +0000 @@ -74,6 +74,7 @@ pre-binary-stamp: dh_clean dh_installdirs $(MAKE) install DESTDIR=`pwd`/debian/tmp + -find -name site-packages | xargs rm -rf $(MAKE) -C doc/man install DESTDIR=`pwd`/debian/tmp set -e; \ cd bindings/Python; \ @@ -199,7 +200,7 @@ $(pythonpkg): build pre-binary $(libpkg) dh_compress -p $@ dh_fixperms -p $@ dh_makeshlibs -p $@ - dh_pysupport -p $@ + dh_python2 -p$@ dh_installdeb -p $@ dh_shlibdeps -p $@ dh_gencontrol -p $@ @@ -214,7 +215,7 @@ $(pythonpkg)-dbg: build pre-binary $(pyt dh_compress -p $@ dh_fixperms -p $@ dh_makeshlibs -p $@ - dh_pysupport -p $@ + dh_python2 -p$@ dh_installdeb -p $@ dh_shlibdeps -p $@ dh_gencontrol -p $@
debian/control

--- 0.12.5-4/debian/control 2011-08-06 17:02:04.000000000 +0000 +++ 0.12.5-4ubuntu1/debian/control 2011-12-17 13:29:57.000000000 +0000 @@ -1,10 +1,10 @@ Source: pilot-link Section: otherosfs -Build-Depends: debhelper (>= 7.2.2), perl (>= 5.6), libpng-dev, libreadline-dev | libreadline-dev, python-all-dev (>= 2.3), python-support (>= 0.3), python-all-dbg, libusb-dev, libbluetooth-dev [linux-any], pkg-config, libpopt-dev +Build-Depends: debhelper (>= 7.2.2), perl (>= 5.6), libpng-dev, libreadline-dev | libreadline-dev, python-all-dev (>= 2.6.6-3~), python-all-dbg, libusb-dev, libbluetooth-dev [linux-any], pkg-config, libpopt-dev Priority: optional Maintainer: Ludovic Rousseau <rousseau@debian.org> Standards-Version: 3.9.2 -XS-Python-Version: >= 2.3 +X-Python-Version: >= 2.3 Homepage: http://www.pilot-link.org/ Package: pilot-link
debian/libpisock9.udev

--- 0.12.5-4/debian/libpisock9.udev 1970-01-01 00:00:00.000000000 +0000 +++ 0.12.5-4ubuntu1/debian/libpisock9.udev 2011-12-17 13:46:41.000000000 +0000 @@ -0,0 +1,47 @@ +# $Id: 60-libpisock.rules,v 1.4 2007/02/16 18:26:41 desrod Exp $ +# +# udev rules file for pilot-link's libpisock library, enabled for libusb +# +SUBSYSTEMS!="usb", ACTION!="add", GOTO="libpisock_rules_end" + +# Sony handheld devices +ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0038", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0066", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0095", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="054c", ATTRS{idProduct}=="009a", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="054c", ATTRS{idProduct}=="00da", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="054c", ATTRS{idProduct}=="00e9", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0144", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="054c", ATTRS{idProduct}=="0169", GROUP="dialout", MODE="0664" + +# Handspring handheld devices +ATTRS{idVendor}=="082d", ATTRS{idProduct}=="0100", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="082d", ATTRS{idProduct}=="0200", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="082d", ATTRS{idProduct}=="0300", GROUP="dialout", MODE="0664" + +# Palm, Inc. and palmOne handheld devices +ATTRS{idVendor}=="04e8", ATTRS{idProduct}=="6601", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="04e8", ATTRS{idProduct}=="8001", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0001", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0002", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0003", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0020", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0031", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0040", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0050", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0060", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0061", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0070", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0830", ATTRS{idProduct}=="0080", GROUP="dialout", MODE="0664" + +# Garmin iQue 3600 +ATTRS{idVendor}=="091e", ATTRS{idProduct}=="0004", GROUP="dialout", MODE="0664" +ATTRS{idVendor}=="0c88", ATTRS{idProduct}=="0021", GROUP="dialout", MODE="0664" + +# Tapwave Zodiac 1 & 2 +ATTRS{idVendor}=="12ef", ATTRS{idProduct}=="0100", GROUP="dialout", MODE="0664" + +# Unknown device (can someone confirm?) +ATTRS{idVendor}=="4766", ATTRS{idProduct}=="0001", GROUP="dialout", MODE="0664" + +LABEL="libpisock_rules_end"

Available patches from Ubuntu

Modified packages are listed below: