diff -Nru libgphoto2-2.4.10.1/debian/changelog libgphoto2-2.4.10.1/debian/changelog --- libgphoto2-2.4.10.1/debian/changelog 2011-03-24 22:29:12.000000000 +0000 +++ libgphoto2-2.4.10.1/debian/changelog 2011-10-13 02:16:44.000000000 +0000 @@ -1,3 +1,11 @@ +libgphoto2 (2.4.10.1-2ubuntu5ppa1) natty; urgency=low + + * debian/patches/90_fix_kodak_v1253.patch: Added a fix to reset + that fixes the Kodak V1253. + * + + -- Chris Wulff Wed, 12 Oct 2011 22:16:35 -0400 + libgphoto2 (2.4.10.1-2ubuntu5) natty; urgency=low * debian/rules: empty dependency_libs from shipped .la files, per diff -Nru libgphoto2-2.4.10.1/debian/patches/90_fix_kodak_v1253.patch libgphoto2-2.4.10.1/debian/patches/90_fix_kodak_v1253.patch --- libgphoto2-2.4.10.1/debian/patches/90_fix_kodak_v1253.patch 1970-01-01 00:00:00.000000000 +0000 +++ libgphoto2-2.4.10.1/debian/patches/90_fix_kodak_v1253.patch 2011-10-13 01:35:44.000000000 +0000 @@ -0,0 +1,27 @@ +--- libgphoto2-2.4.10.1/camlibs/ptp2/library.c 2011-10-12 21:11:04.609831531 -0400 ++++ libgphoto2-2.4.10.1/camlibs/ptp2/library.c 2011-10-12 21:28:19.199831087 -0400 +@@ -5594,12 +5594,23 @@ + sessionid = 1; + while (1) { + ret=ptp_opensession (params, sessionid); +- while (ret==PTP_RC_InvalidTransactionID) { ++ if (ret==PTP_RC_InvalidTransactionID) { + sessionid++; + if (retried < 10) { + retried++; + continue; + } ++ ++ if (retried < 11) { ++ retried++; ++ /* Try whacking PTP device */ ++ if (camera->port->type == GP_PORT_USB) { ++ ptp_usb_control_device_reset_request (&camera->pl->params); ++ sessionid = 1; ++ continue; ++ } ++ } ++ + /* FIXME: deviceinfo is not read yet ... */ + report_result(context, ret, params->deviceinfo.VendorExtensionID); + return translate_ptp_result(ret); diff -Nru libgphoto2-2.4.10.1/debian/patches/debian-changes-2.4.10.1-2ubuntu5 libgphoto2-2.4.10.1/debian/patches/debian-changes-2.4.10.1-2ubuntu5 --- libgphoto2-2.4.10.1/debian/patches/debian-changes-2.4.10.1-2ubuntu5 1970-01-01 00:00:00.000000000 +0000 +++ libgphoto2-2.4.10.1/debian/patches/debian-changes-2.4.10.1-2ubuntu5 2011-10-13 01:35:55.000000000 +0000 @@ -0,0 +1,36 @@ +Description: Upstream changes introduced in version 2.4.10.1-2ubuntu5 + This patch has been created by dpkg-source during the package build. + Here's the last changelog entry, hopefully it gives details on why + those changes were made: + . + libgphoto2 (2.4.10.1-2ubuntu5) natty; urgency=low + . + * debian/rules: empty dependency_libs from shipped .la files, per + Policy 10.2. + . + The person named in the Author field signed this changelog entry. +Author: Kees Cook + +--- +The information above should follow the Patch Tagging Guidelines, please +checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here +are templates for supplementary fields that you might want to add: + +Origin: , +Bug: +Bug-Debian: http://bugs.debian.org/ +Bug-Ubuntu: https://launchpad.net/bugs/ +Forwarded: +Reviewed-By: +Last-Update: + +--- /dev/null ++++ libgphoto2-2.4.10.1/camlibs/ptp2/library.loT +@@ -0,0 +1,7 @@ ++# ptp2/library.lo - a libtool object file ++# Generated by ltmain.sh - GNU libtool 1.5.26 (1.1220.2.492 2008/01/30 06:40:56) ++# ++# Please DO NOT delete this file! ++# It is necessary for linking the library. ++ ++# Name of the PIC object. diff -Nru libgphoto2-2.4.10.1/debian/patches/series libgphoto2-2.4.10.1/debian/patches/series --- libgphoto2-2.4.10.1/debian/patches/series 2010-12-05 13:28:49.000000000 +0000 +++ libgphoto2-2.4.10.1/debian/patches/series 2011-10-13 01:35:55.000000000 +0000 @@ -2,3 +2,5 @@ #11_hurd_no_path_max_bsdsource 70_increase_max_entries 80_avchd_support.patch +90_fix_kodak_v1253.patch +debian-changes-2.4.10.1-2ubuntu5