diff -u pilot-link-0.12.4/debian/changelog pilot-link-0.12.4/debian/changelog --- pilot-link-0.12.4/debian/changelog +++ pilot-link-0.12.4/debian/changelog @@ -1,3 +1,12 @@ +pilot-link (0.12.4-2ubuntu1) karmic; urgency=low + + * Merge from debian unstable (LP: #399595), remaining changes: + - debian/control: Add Breaks to ensure the right version of udev is used. + - debian/rules: Build for python2.6. + - debian/rules: Use dh_installmodules + + -- Fabrice Coutadeur Wed, 15 Jul 2009 06:43:21 +0200 + pilot-link (0.12.4-2) unstable; urgency=low * now for unstable. I do not expect transition problems. @@ -78,6 +87,50 @@ -- Ludovic Rousseau Sun, 15 Feb 2009 20:24:16 +0100 +pilot-link (0.12.3-5ubuntu6) jaunty; urgency=low + + * debian/libpisock9.modprobe: If we're going to ship a modprobe + configuration, let's do this properly! + * debian/rules: Use dh_installmodules + * debian/libpisock9.install: Drop old install line + * debian/control: Bump d-b on debhelper to use correct path + + -- Scott James Remnant Thu, 05 Mar 2009 18:01:29 +0000 + +pilot-link (0.12.3-5ubuntu5) jaunty; urgency=low + + * Build for python2.6. + + -- Matthias Klose Mon, 23 Feb 2009 16:23:41 +0100 + +pilot-link (0.12.3-5ubuntu4) jaunty; urgency=low + + * Add Breaks to ensure the right version of udev is used. + + -- Scott James Remnant Fri, 09 Jan 2009 11:57:19 +0000 + +pilot-link (0.12.3-5ubuntu3) jaunty; urgency=low + + * Rebuild against new debhelper for udev rules path change. + + -- Scott James Remnant Tue, 06 Jan 2009 18:32:41 +0000 + +pilot-link (0.12.3-5ubuntu2) jaunty; urgency=low + + * Add 10_clie_sj22.patch: Fix flags for Sony Clie SJ-22. (LP: #282491) + + -- Martin Pitt Mon, 10 Nov 2008 18:40:40 +0100 + +pilot-link (0.12.3-5ubuntu1) jaunty; urgency=low + + * Merge with Debian unstable; remaining Ubuntu changes: + - debian/control: Adjust dependency to real libbluetooth-dev package. + (Forwarded to Debian #505200) + - 30_3_arg_open.patch: open(2) has 3 arguments with O_CREAT. + (Forwarded to Debian #505201) + + -- Martin Pitt Mon, 10 Nov 2008 14:51:52 +0100 + pilot-link (0.12.3-5) unstable; urgency=low * Patch from Ubuntu for the python-pisock-dbg package @@ -1061,0 +1115 @@ + diff -u pilot-link-0.12.4/debian/control pilot-link-0.12.4/debian/control --- pilot-link-0.12.4/debian/control +++ pilot-link-0.12.4/debian/control @@ -2,7 +2,8 @@ Section: otherosfs Build-Depends: debhelper (>= 7.2.2), perl (>= 5.6), libpng-dev, libreadline5-dev | libreadline-dev, quilt, python-all-dev (>= 2.3), python-support (>= 0.3), python-all-dbg, libusb-dev, libbluetooth-dev [!kfreebsd-amd64 !kfreebsd-i386], pkg-config, libpopt-dev Priority: optional -Maintainer: Ludovic Rousseau +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ludovic Rousseau Standards-Version: 3.8.1 XS-Python-Version: >= 2.3 Homepage: http://www.pilot-link.org/ @@ -12,6 +13,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends} Conflicts: pilot-link-perl Suggests: libpda-pilot-perl, libmd5-perl +Breaks: udev (<< 136-1) Description: tools to communicate with a PalmOS PDA The package contains many command line programs to manipulate databases stored on a PalmOS PDA. For example pilot-xfer can be used to backup, diff -u pilot-link-0.12.4/debian/rules pilot-link-0.12.4/debian/rules --- pilot-link-0.12.4/debian/rules +++ pilot-link-0.12.4/debian/rules @@ -86,8 +86,8 @@ set -e; \ cd bindings/Python; \ for python in $(PYVERS); do \ - $$python setup.py install --root=$(CURDIR)/debian/tmp; \ - $$python-dbg setup.py install --root=$(CURDIR)/debian/python-pisock-dbg; \ + $$python setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb; \ + $$python-dbg setup.py install --root=$(CURDIR)/debian/python-pisock-dbg --install-layout=deb; \ done # mini patches @@ -98,9 +98,9 @@ mv debian/tmp/usr/share/pilot-link/udev/60-libpisock.rules debian/libpisock9.udev # remove .py files to avoid conflicts with python-pisock package - rm debian/python-pisock-dbg/usr/lib/python*/site-packages/*.py + rm debian/python-pisock-dbg/usr/lib/python*/*-packages/*.py # remove egg file too (LP: #202773) - rm debian/python-pisock-dbg/usr/lib/python*/site-packages/python_libpisock-*.egg-info + rm debian/python-pisock-dbg/usr/lib/python*/*-packages/python_libpisock-*.egg-info dh_install --list-missing --sourcedir=debian/tmp touch pre-binary-stamp @@ -117,7 +117,8 @@ dh_testroot dh_installdirs -p $@ dh_installdocs -p $@ - dh_installudev + dh_installudev -p $@ + dh_installmodules -p $@ dh_installchangelogs -p $@ dh_strip -p $@ --dbg-package=$(pythonpkg)-dbg dh_strip -p $@