diff -Nru pilot-link-0.12.4/debian/changelog pilot-link-0.12.4/debian/changelog --- pilot-link-0.12.4/debian/changelog 2009-12-06 20:48:59.000000000 +0530 +++ pilot-link-0.12.4/debian/changelog 2010-01-05 20:35:18.000000000 +0530 @@ -1,3 +1,12 @@ +pilot-link (0.12.4-7ubuntu1) lucid; urgency=low + + * Merge from debian testing. Remaining changes: LP: #503437 + - debian/control: Add Breaks to ensure the right version of udev is used. + (Change has to be continued as udev versioning in debian and + ubuntu are different). + + -- Bhavani Shankar Tue, 05 Jan 2010 20:34:29 +0530 + pilot-link (0.12.4-7) unstable; urgency=low * Fix "please no longer suggest libmd5-perl" by removing "Suggests: @@ -33,6 +42,15 @@ -- Ludovic Rousseau Wed, 26 Aug 2009 14:47:12 +0200 +pilot-link (0.12.4-3ubuntu1) karmic; urgency=low + + * Merge from debian unstable, remaining changes: LP: #402102 + - debian/control: Add Breaks to ensure the right version of udev is used. + (Change has to be continued as udev versioning in debian and + ubuntu are different). + + -- Bhavani Shankar Tue, 25 Aug 2009 18:58:17 +0530 + pilot-link (0.12.4-3) unstable; urgency=low * debian/patches/31_pilot-addresses.1: remove reference to addresses(1) @@ -51,6 +69,15 @@ -- Ludovic Rousseau Mon, 20 Jul 2009 18:42:54 +0200 +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. @@ -131,6 +158,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 @@ -1112,3 +1183,4 @@ * debian/dirs: specifically include usr/man/man1. -- Mark W. Eichin Tue, 1 Jul 1997 01:38:08 -0400 + diff -Nru pilot-link-0.12.4/debian/control pilot-link-0.12.4/debian/control --- pilot-link-0.12.4/debian/control 2009-12-05 20:45:21.000000000 +0530 +++ pilot-link-0.12.4/debian/control 2010-01-05 20:31:51.000000000 +0530 @@ -2,7 +2,8 @@ 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 [!kfreebsd-amd64 !kfreebsd-i386 !hurd-i386], pkg-config, libpopt-dev Priority: optional -Maintainer: Ludovic Rousseau +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ludovic Rousseau Standards-Version: 3.8.3 XS-Python-Version: >= 2.3 Homepage: http://www.pilot-link.org/ @@ -57,7 +58,7 @@ Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} Suggests: jpilot, pilot-link, kpilot, gnome-pilot, evolution, claws-mail, sylpheed -Breaks: udev (<< 0.136-1), jpilot (<< 1.6.2.4-2), python-jppy (<= 0.0.47-1.1) +Breaks: udev (<< 136-1), jpilot (<< 1.6.2.4-2), python-jppy (<= 0.0.47-1.1) Conflicts: pilot-link (<< 0.12.2-7) Replaces: pilot-link (<< 0.12.2-7) Description: library for communicating with a PalmOS PDA