--- libgphoto2-2.4.2.orig/camlibs/ptp2/library.c +++ libgphoto2-2.4.2/camlibs/ptp2/library.c @@ -853,6 +853,7 @@ /* from Mike Meyer */ {"Apple:iPhone (PTP mode)", 0x05ac, 0x1290, PTPBUG_DCIM_WRONG_PARENT}, + {"Apple:iPhone 3G (PTP mode)", 0x05ac, 0x1292, PTPBUG_DCIM_WRONG_PARENT}, /* https://sourceforge.net/tracker/index.php?func=detail&aid=1869653&group_id=158745&atid=809061 */ {"Pioneer:DVR-LX60D", 0x08e4, 0x0142, 0}, }; --- libgphoto2-2.4.2.orig/debian/changelog +++ libgphoto2-2.4.2/debian/changelog @@ -0,0 +1,957 @@ +libgphoto2 (2.4.2-0ubuntu2) intrepid; urgency=low + + * add iPhone 3G support + + -- Chris Jones Wed, 17 Sep 2008 03:13:59 +0100 + +libgphoto2 (2.4.2-0ubuntu1) intrepid; urgency=low + + * Merge from Debian unstable of 2.4.1-2 version. Remaining Ubuntu changes: + - Use HAL's automatic ACLs instead of udev rules for controlling + permissions on USB devices. + * Drop debian/TODO file, useless in Ubuntu. + * New upstream release 2.4.2, LP: #252408. + * debian/control: modify libltdl3-dev to libltdl7-dev in Build-Depends field, + there is a new version of libtool in Ubuntu. + * Drop 20_backport_initial_startup_speedup.dpatch patch, merged upstream. + * Update 45_increase_canon_timeout.dpatch patch. + * Add deprecated_lt_dlcaller_register.dpatch patch, fix FTBFS caused by + the rename of lt_dlcaller_register to lt_dlinterface_register in the + libtool included in Ubuntu. + + -- Devid Filoni Sun, 27 Jul 2008 21:54:04 +0200 + +libgphoto2 (2.4.1-2) unstable; urgency=low + + * Since 2.4.2 was released a bit before the freeze, not rushing its + upload for lenny. After having asked usptream, the r11066 revision + deserves to be backported, so as to improve the initial startup + time. Thanks to Marcus Meissner for having provided the tip, along + with the patch: + - Add 20_backport_initial_startup_speedup.dpatch + * Version the Recommends on udev (which is conditionally specified + through the ${udev-hotplug} variable in debian/rules), since + libgphoto2 now uses the alternative syntax (that is: key!="a|b"), + which apparently was introduced in udev 0.109. Adding “(>= 0.113-1)” + since that's the first version in Debian which included this + feature. Many thanks to Jan Echternach for having spotted the problem + as well as its solution (Closes: #491065). + + -- Cyril Brulebois Fri, 25 Jul 2008 23:49:37 +0200 + +libgphoto2 (2.4.1-1) unstable; urgency=low + + * New upstream release (Closes: #480127): + - Not bumping shlibs, no new symbol. + - To achieve this, use two dh_makeshlibs calls (one for + libgphoto2-port0 and one for libgphoto2-$(major), and provide with + the last upstream version sharing the same ABI. Using 2.4.0 here + although some former versions might have been specified. That + shouldn't make any difference from a testing migration point of + view. + * debian/copyright: + - Use an almost decent copyright format, as discussed on + . + - Properly specify copyright holders and licenses, grouping them by + components when possible. + * debian/patches: + - Drop 30_additional_camera_support.dpatch, merged upstream. + - Update 45_increase_canon_timeout.dpatch, upstream bumped the + timeout from 75 to 150 (Debian had 750), but 750 looks doing a + better job according to user comments on the tracker. Keeping that + value. + - Drop 65_udev_usb_subsystem.dpatch, merged upstream (using another + approach). + - Drop 75_deprecated_hal_key.dpatch, merged upstream. + - Drop disabled patches (from the list and from that directory) since + one can get them back from the VCS. + * debian/libgphoto2-2.dirs: + - Drop “/usr/share/hal/fdi/information/10freedesktop” from + there. There's no use shipping an empty directory (especially since + the maintainer scripts are taking care of removing files previously + created in that directory). + * debian/libgphoto2-2-dev.files: + - Drop “*.la” files from /usr/lib only (not from the subdirectories). + - Remove them in debian/rules before trying to remove debian/tmp. + - Drop the recursive symlink (“/usr/include/gphoto2/gphoto2 -> .”). + - Remove it in debian/rules before running dh_movefiles. + * debian/rules: + - Remove “patch” and “unpatch” targets since dpatch.make is included + already. + - Move the single dependency on “unpatch-stamp” to “unpatch” since + there's no stamp for “unpatch”. + - Move the dependency on “patch” to “patch-stamp”, so as to avoid + unneeded ./configure re-runs. + * debian/control: + - Clean the Depends of the -dev package: + - Use libc-dev instead of libc6-dev (there are at least libc0.1, + libc0.3, libc6, libc6.1 and their -dev packages). + - Remove libltdl3-dev, no longer needed since “*.la” files are no + longer shipped under /usr/lib. + - Remove a trailing space in all long descriptions. + - Bump Standards-Version from 3.7.3 to 3.8.0 (no change needed). + - Add back graphviz to generate all documentation items. + - Update my mail address. + + -- Cyril Brulebois Sun, 13 Jul 2008 19:34:36 +0200 + +libgphoto2 (2.4.0-9ubuntu2) intrepid; urgency=low + + * debian/patches/30_additional_camera_support.dpatch: + - Add USB ids for Nikon D60 + + -- Scott James Remnant Wed, 09 Jul 2008 23:07:19 +0300 + +libgphoto2 (2.4.0-9ubuntu1) intrepid; urgency=low + + * Merge with Debian unstable. Remaining Ubuntu changes: + - Use HAL's automatic ACLs instead of udev rules for controlling + permissions on USB devices: + + debian/control: Change udev recommendation to hal. + + debian/libgphoto2-2.post{inst,rm}, debian/rules: Do not install/remove + udev rules. + + Drop debian/libgphoto2-2.README.Debian, since it does not apply. + - 30_additional_camera_support.dpatch: Updated camera support from + upstream SVN, and merge our previously separate bug fix cherrypick + dpatches into this patch as well. This includes the fix for LP: #228154. + + -- Martin Pitt Thu, 15 May 2008 10:51:07 +0200 + +libgphoto2 (2.4.0-9) unstable; urgency=high + + * Adopt the package within pkg-phototools: + - Set the Maintainer to the group. + - Add Frederic Peters and myself as Uploaders. + - Add Vcs-Browser and Vcs-Git fields accordingly. + * debian/control: + - Add a Depends: on libltdl3-dev to libgphoto2-2-dev since libltdl.la + is referenced in a bunch of “.la” files (Closes: #467527). Setting + urgency to “high” accordingly, since the bug is also in testing. + - Add a Homepage field. + - Make lintian happy, delete the “-1” bits from the versioned B-D on + libhal-dev. + - Bump Standards-Version from 3.7.2 to 3.7.3 (no changes needed). + * debian/copyright: + - Point to LGPL-2 rather than just LGPL, which now points to + LGPL-3 (the copyright says LGPL-2+, but let's be precise). + * debian/patches: + - Add 75_deprecated_hal_key.dpatch: Replace the deprecated HAL + property “info.bus” with “info.subsystem” in the HAL FDI generation + tool, thanks to Martin Pitt (Closes: #472656). + + -- Cyril Brulebois Sun, 30 Mar 2008 17:30:21 +0200 + +libgphoto2 (2.4.0-8) unstable; urgency=low + + * debian/patches/45_increase_canon_timeout.dpatch Increase timeout wait for + an URB to come back on an interrupt endpoint (closes: #453114) + + -- Frederic Peters Tue, 27 Nov 2007 15:15:11 +0100 + +libgphoto2 (2.4.0-7) unstable; urgency=low + + * debian/patches/30_additional_camera_support.dpatch: added Canon G9 + (patch by Harald Dunkel, closes: #446237) + + -- Frederic Peters Thu, 11 Oct 2007 13:05:00 +0200 + +libgphoto2 (2.4.0-6) unstable; urgency=low + + * debian/patches/65_udev_usb_subsystem.dpatch: changed udev rules to go + through device listing for both subsystem usb and usb_device. + (closes: #445660) + + -- Frederic Peters Tue, 09 Oct 2007 17:12:27 +0200 + +libgphoto2 (2.4.0-5) unstable; urgency=low + + * debian/control: + * improved libgphoto2-2 and libgphoto2-dev long descriptions to note + about PTP support (but not MTP since this is not what libgphoto2 + is for) (closes: #347875) (this got lost somewhere) + * removed gtkam suggestion + + -- Frederic Peters Sat, 29 Sep 2007 22:47:08 +0200 + +libgphoto2 (2.4.0-4) unstable; urgency=low + + * debian/patches/60_udev_rules_are_autogenerated_notice.dpatch: adds a note + to udev rules file to explain that file is generated automatically and + that local changes will thus be lost on upgrades. (closes: #341470) + * debian/patches/30_additional_camera_support.dpatch: added support for Fuji + FinePix A800 (closes: #421179) and Nikon Coolpix P5000 (closes: #427173) + * debian/patches/70_increase_max_entries.dpatch: increased max entries from + 1024 to 8192 (closes: #425515, #427476) + * debian/control: updated ${Source-Version} to ${binary:Version} + + -- Frederic Peters Fri, 28 Sep 2007 23:11:10 +0200 + +libgphoto2 (2.4.0-3) unstable; urgency=low + + * debian/libgphoto2-2.postinst: creates device nodes with 0664 mode so + productId, vendorId and such kind of details can be read (closes: #440763) + + -- Frederic Peters Wed, 12 Sep 2007 13:00:53 +0200 + +libgphoto2 (2.4.0-2) unstable; urgency=low + + * debian/patches/11_hurd_no_path_max_bsdsource.dpatch: new patch contributed + by Samuel Thibault, to fix compilation issues on the Hurd,(closes: #434568) + * description: Hurd has no such hard limit like PATH_MAX, and define + _BSD_SOURCE because code uses IXANY and O_NDELAY. + + -- Frederic Peters Wed, 15 Aug 2007 00:13:26 +0200 + +libgphoto2 (2.4.0-1) unstable; urgency=low + + * New upstream release. + * debian/patches/: + * 15_use_bash_in_ptp_camera_check.dpatch: disabled, applied upstream + * 20_fix-zero-vendor-ids.dpatch: disabled, upstream says it is wrong + * 40_disable_canon_fast_directory_retrieval_r10028.dpatch: disabled, + applied upstream + * 50_getenv_home_overflow.dpatch: disabled, applied upstream + * debian/control, debian/rules: removed suggests and recommends on hotplug + (closes: #436504) + * debian/libgphoto2-2.README.Debian: removed parts about hotplug and updated + parts about udev. + * debian/hotplug: removed as no longer useful + * debian/control{,.in}: removed control.in generation via sed, using + not+linux-gnu from typehandling instead + * debian/rules: installs new check-mtp-device into libgphoto2-port0 + + -- Frederic Peters Thu, 09 Aug 2007 16:02:30 +0200 + +libgphoto2 (2.3.1-8) unstable; urgency=low + + * 50_getenv_home_overflow.dpatch: fixed upstream typo, sprintf -> snprintf, + (upstream r10453) (closes: #434552, #434386) + + -- Frederic Peters Tue, 24 Jul 2007 22:22:14 +0200 + +libgphoto2 (2.3.1-7) unstable; urgency=low + + * 50_getenv_home_overflow.dpatch: load_settings/save_settings: updated as + applied by upstream. + * debian/rules: don't ignore potential make clean errors + + -- Frederic Peters Sat, 21 Jul 2007 12:42:16 +0200 + +libgphoto2 (2.3.1-6) unstable; urgency=low + + * 50_getenv_home_overflow.dpatch: load_settings/save_settings: don't copy + more characters from $HOME than possible in buffer. + + -- Frederic Peters Fri, 20 Jul 2007 13:21:55 +0200 + +libgphoto2 (2.3.1-5) unstable; urgency=low + + * debian/patches/40_disable_canon_fast_directory_retrieval_r10028: disable + fast directory retrieval on Canon models since this is broken on some. + (closes: #422386). + + -- Frederic Peters Mon, 07 May 2007 10:15:25 +0200 + +libgphoto2 (2.3.1-4) unstable; urgency=low + + * debian/patches/20_fix-zero-vendor-ids.dpatch: replaces old and broken + 20_disable_generic_mtp_udev_rule, patch from upstream and Martin Pitt, + thanks. + + -- Frederic Peters Wed, 02 May 2007 19:38:17 +0200 + +libgphoto2 (2.3.1-3) unstable; urgency=low + + * Upload to unstable. + + -- Frederic Peters Wed, 11 Apr 2007 10:09:10 +0200 + +libgphoto2 (2.3.1-2) experimental; urgency=low + + * debian/libgphoto2-2.{postinst,postrm}: check for /etc/init.d/udev script. + * debian/patches/15_use_bash_in_ptp_camera_check.dpatch: use bash since the + script has bashisms. + * debian/patches/20_disable_generic_mtp_rules.dpatch: do not generate udev + or fdi entries for devices with 0x0000 as idVendor (this affects generic + MTP devices) (closes: #408253) + + -- Frederic Peters Wed, 24 Jan 2007 19:18:31 +0100 + +libgphoto2 (2.3.1-1) experimental; urgency=low + + * New upstream version. + * removed debian/patches/20_udev_rules: shipped upstream + * debian/libgphoto2-2.files: print-usb-usermap is no longer shipped; no + more need to exclude it for kernels other than Linux + + -- Frederic Peters Tue, 16 Jan 2007 11:25:42 +0100 + +libgphoto2 (2.3.0-2) experimental; urgency=low + + * debian/control.in: added libusb-dev as libgphoto2-dev dependency. + (closes: #407108) + + -- Frederic Peters Tue, 16 Jan 2007 10:22:58 +0100 + +libgphoto2 (2.3.0-1) experimental; urgency=low + + * New upstream version. + * Uploaded to experimental. + * (closes: #402875) + * Synced with Ubuntu packaging. + * debian/rules: Install check_ptp_camera to libgphoto2-2's lib/udev/ + * debian/rules: Remove the 'make all-local' call, it does not work any more + and is not necessary any more either. + * debian/*.files{,.in}: Turn versions in paths into globs to match newer + versions. + * debian/libgphoto2-2.postinst: Call print-camera-list with mode and group + arguments (this replaces the former source code patch.) + * Moved to dpatch: + * 10_disable_cache: do not cache all downloaded files to plug a giant + memory hole + * 20_udev_rules: upstream SVN change 9562 to add and use an udev helper + script to detect whether a USB device has a PtP compatible interface. + * 30_additional_camera_support: USB IDs for new and supported camera models + (Sony DSC-W5, patch by Otavio Salvador, closes: #402687) + + -- Frederic Peters Sat, 13 Jan 2007 15:20:25 +0100 + +libgphoto2 (2.2.1-12) unstable; urgency=low + + * debian/udev_generic_ptp_support.rules: create note earlier on for PTP + cameras, so they get correct membership and permissions. + * debian/control.in: added build-depends on libdbus-1-dev + + -- Frederic Peters Mon, 27 Nov 2006 21:50:23 +0100 + +libgphoto2 (2.2.1-11) unstable; urgency=low + + * libgphoto2_port/disk/disk.c: removed call dbus_connection_close() (already + done in upstream svn) (closes: #398022) + * camlibs/ptp2/library.c: added USB id for Canon PowerShot G7 + (closes: #399421) + * debian/libgphoto2-2.README.Debian: added explanation about udev user + rules; as long as generic capability is not handled by shipped udev rules. + + -- Frederic Peters Sun, 19 Nov 2006 17:06:56 +0000 + +libgphoto2 (2.2.1-10) unstable; urgency=low + + * camlibs/ptp2/library.c: added USB id for Canon EOS 400D (already present + in upstream svn) (closes: #396581) + * camlibs/ptp2/library.c: added USB id for Canon Digital IXUS 850 IS. + + -- Frederic Peters Sat, 4 Nov 2006 12:08:56 +0100 + +libgphoto2 (2.2.1-9) unstable; urgency=low + + * camlibs/ptp2/library.c: added new USB id for Canon PowerShot A710 IS + (closes: #395380) (patch sent by Martin Pitt/Ubuntu, thanks). + * packaging/generic/print-camera-list.c, debian/hotplug: changed camera + group from 'camera' to 'plugdev'. + * debian/libgphoto2-2.README.Debian, debian/libgphoto2-2.NEWS: documented + this change. + * debian/libgphoto2-2.postinst: reload udev rules on install. + + -- Frederic Peters Thu, 26 Oct 2006 20:43:33 +0200 + +libgphoto2 (2.2.1-8) unstable; urgency=low + + * camlibs/ptp2/library.c: added new USB id for Nikon Coolpix 4600. + (closes: #394762) (thanks to Roberto Costa) + + -- Frederic Peters Mon, 23 Oct 2006 12:49:00 +0200 + +libgphoto2 (2.2.1-7) unstable; urgency=low + + * camlibs/ptp2/library.c: added Fuji F30, patch by Scott Zuk. + (closes: #392512) + + -- Frederic Peters Thu, 12 Oct 2006 08:58:47 +0200 + +libgphoto2 (2.2.1-6) unstable; urgency=low + + * camlibs/ptp2/library.c: added Canon Ixus 65, take from Ubuntu patch. + * debian/libgphoto2-2.postinst: merged FDI file code from Ubuntu postinst: + + Do not install a separate 10-camera-libgphoto2-device.fdi + 10-camera-libgphoto2.fdi already has everything required. + + -- Frederic Peters Mon, 9 Oct 2006 22:20:57 +0200 + +libgphoto2 (2.2.1-5) unstable; urgency=low + + * debian/libgphoto2-2.postinst: fixed .fdi file extension. (closes: #389601) + * debian/libgphoto2-2.postrm: remove generated files on purge and remove. + + -- Frederic Peters Sat, 30 Sep 2006 22:21:04 +0200 + +libgphoto2 (2.2.1-4) unstable; urgency=low + + * camlibs/ptp2/library.c: added Kodak CD3 USB id. (closes: #387998) + + -- Frederic Peters Mon, 18 Sep 2006 10:41:00 +0200 + +libgphoto2 (2.2.1-3) unstable; urgency=low + + * libgphoto2_port/disk/disk.c: dbus_connection_disconnect has been + deprecated, using dbus_connection_close instead. Report and patch + by Sebastian Dröge, thanks. (closes: #385379) + + -- Frederic Peters Thu, 7 Sep 2006 19:38:04 +0200 + +libgphoto2 (2.2.1-2) unstable; urgency=low + + * libgphoto2/gphoto2-filesys.c: Do not cache all downloaded files to plug + a giant memory hole (from Ubuntu patch). (closes: #372166) + + -- Frederic Peters Mon, 3 Jul 2006 14:09:28 +0200 + +libgphoto2 (2.2.1-1) unstable; urgency=low + + * New upstream version. + - merged GNU/kFreeBSD patch. + * added Dutch translation. (closes: #374852) + * packaging/linux-hotplug/: removed print-udev-rules which is no longer + used. + + -- Frederic Peters Thu, 22 Jun 2006 09:39:24 +0200 + +libgphoto2 (2.2.0-5) unstable; urgency=low + + * libgphoto2_port/serial/unix.c: GNU/kFreeBSD fix. (closes: #374468) + + -- Frederic Peters Mon, 19 Jun 2006 23:05:11 +0200 + +libgphoto2 (2.2.0-4) unstable; urgency=low + + * debian/control.in: do not build-depends on libhal-dev on kFreeBSD + (closes: #369577) + + -- Frederic Peters Mon, 19 Jun 2006 08:41:37 +0200 + +libgphoto2 (2.2.0-3) unstable; urgency=low + + * debian/libgphoto2-2.dirs: installs HAL FDI directory since hal is not a + dependency. (closes: #374285) + + -- Frederic Peters Sun, 18 Jun 2006 13:26:17 +0200 + +libgphoto2 (2.2.0-2) unstable; urgency=low + + * packaging/generic/Makefile.am: added INCLUDES variable so it builds even + without libgphoto2-2-dev already installed. (closes: #374259) + + -- Frederic Peters Sun, 18 Jun 2006 10:42:15 +0200 + +libgphoto2 (2.2.0-1) unstable; urgency=low + + * New upstream release, uploaded to unstable + * camlibs/ptp2/library.c: removed duplicate filename patch + * debian/changelog: merged parallel history from 2.1.6-7 -> 2.1.6-13 + * debian/libgphoto2-2.postinst: now use print-camera-list + + -- Frederic Peters Sun, 18 Jun 2006 01:08:15 +0200 + +libgphoto2 (2.1.99-13) experimental; urgency=low + + * print-udev-rules.c: reworked udev rules so they can work in more cases. + * removed Canon PowerShot A610 from cameras with Canon protocol; it only + has PTP. + * sync with 2.1.6-13 + + -- Frederic Peters Tue, 30 May 2006 16:22:33 +0200 + +libgphoto2 (2.1.99-12) experimental; urgency=low + + * print-udev-rules.c: fixed according to explanations in #368893, reinstate + BUS!="usb" line and specify SUBSYSTEM on generic PTP line. + * added Canon PowerShot A530 and A540. + * print-udev-rules.c: once again shooting in the dark (changed to matching + on SUBSYSTEM instead of BUS) + * synced with 2.1.6-12 + + -- Frederic Peters Mon, 29 May 2006 13:46:18 +0200 + +libgphoto2 (2.1.99-11) experimental; urgency=low + + * print-udev-rules.c: fixed according to tip by Marcus Meissner, so it will + match newer PTP cameras. (sync with 2.1.6-10) + + -- Frederic Peters Tue, 16 May 2006 09:09:30 +0200 + +libgphoto2 (2.1.99-10) experimental; urgency=low + + * camlibs/ptp2/library.c: added Kodak EasyShare Z740 + * debian/rules: use DEB_HOST_ARCH_OS, not DEB_HOST_GNU_SYSTEM + * debian/control.in: *really* added build-depends on doxygen, graphviz. + (closes: #356942) + * debian/compat: bumped to 5 + + -- Frederic Peters Mon, 15 May 2006 13:00:55 +0200 + +libgphoto2 (2.1.99-9) experimental; urgency=low + + * packaging/linux-hotplug/print-udev-rules.c: removed BUS!=usb line since + BUS was not reported by udev. + + -- Frederic Peters Mon, 3 Apr 2006 11:28:36 +0200 + +libgphoto2 (2.1.99-8) experimental; urgency=low + + * packaging/linux-hotplug/print-udev-rules.c: splitted match line + (closes: #359796) + * packaging/linux-hotplug/print-udev-rules.c: always change device access + rights to 0660 + + -- Frederic Peters Wed, 29 Mar 2006 09:57:01 +0200 + +libgphoto2 (2.1.99-7) experimental; urgency=low + + * debian/control: libgphoto2-port0 doesn't depend on libgphoto2; only keep + it the other way, breaking circular depends. (closes: #357796) + + -- Frederic Peters Sun, 19 Mar 2006 17:08:36 +0100 + +libgphoto2 (2.1.99-6) experimental; urgency=low + + * debian/control: added build-depends on doxygen, graphviz. + (closes: #356942) + + -- Frederic Peters Tue, 14 Mar 2006 23:11:45 +0100 + +libgphoto2 (2.1.99-5) experimental; urgency=low + + * camlibs/ptp2/library.c: synced with patch from Ubuntu. + + -- Frederic Peters Sat, 11 Mar 2006 10:47:51 +0100 + +libgphoto2 (2.1.99-4) experimental; urgency=low + + * debian/libgphoto2-2.prerm: clean udev/hotplug files from /etc/ on purge. + + -- Frederic Peters Mon, 6 Mar 2006 20:52:35 +0100 + +libgphoto2 (2.1.99-3) experimental; urgency=low + + * debian/control: build-depends on libhal-dev so libgphoto2_port is built + with HAL support. (closes: #355212) + + -- Frederic Peters Sat, 4 Mar 2006 12:45:33 +0100 + +libgphoto2 (2.1.99-2) experimental; urgency=low + + * debian/postinst: generate .fdi file. + + -- Frederic Peters Wed, 15 Feb 2006 12:46:03 +0100 + +libgphoto2 (2.1.99-1) experimental; urgency=low + + * New upstream release. + * Upload to experimental. (closes: #347873) + * Canon IXUS 750 is recognised. (closes: #346323) + * Don't cache everything, patch from 2.1.6-5.3 is thus removed. + * Forward ported: + * Derived print-udev-rules from print-usb-usermap to generate the udev + rules file. + * camlibs/ptp2/library.c: ported (kludgy) patch to work with HP + PhotoSmart 850 (as requested by user). + * debian/control: + * improved libgphoto2-2 and libgphoto2-dev long descriptions to note + about PTP support (but not MTP since this is not what libgphoto2 + is for) (closes: #347875) + * added note about Disk support to libgphoto2-port long description. + * camlibs/ptp2/library.c: added support for Kodak EasyShare C360 + (closes: #345016) + * packaging/linux-hotplug/print-udev-rules.c: changed to use new udev rule + (closes: #342279, #341151) + * debian/hotplug: this totally removes hotplug calls for newer udev + versions; hotplug script still installed for old hotplug installs. + + -- Frederic Peters Sun, 15 Jan 2006 22:56:48 +0100 + +libgphoto2 (2.1.6-13) unstable; urgency=low + + * print-udev-rules.c: reworked rules file so it should work whatever udev + discrepancy happens. (closes: #369476) + + -- Frederic Peters Tue, 30 May 2006 14:24:43 +0200 + +libgphoto2 (2.1.6-12) unstable; urgency=low + + * camlibs/ptp2/library.c: added Canon PowerShot A540, thanks to David + Goodenough (closes: #369143) + * camlibs/ptp2/library.c: added Canon PowerShot A610. + * print-udev-rules.c: once again shooting in the dark (changed to matching + on SUBSYSTEM instead of BUS) + + -- Frederic Peters Mon, 29 May 2006 13:42:35 +0200 + +libgphoto2 (2.1.6-11) unstable; urgency=low + + * print-udev-rules.c: fixed according to explanations in #368893, reinstate + BUS!="usb" line and specify SUBSYSTEM on generic PTP line. + * camlibs/ptp2/library.c: added Canon PowerShot A530, thanks to Ales + Kozumplik (closes: #368893) + + -- Frederic Peters Fri, 26 May 2006 10:51:03 +0200 + +libgphoto2 (2.1.6-10) unstable; urgency=low + + * print-udev-rules.c: fixed according to tip by Marcus Meissner, so it will + match newer PTP cameras. + + -- Frederic Peters Tue, 16 May 2006 09:06:33 +0200 + +libgphoto2 (2.1.6-9) unstable; urgency=low + + * camlibs/ptp2/library.c: added Kodak EasyShare Z740 (closes: #367350) + * debian/rules: use DEB_HOST_ARCH_OS, not DEB_HOST_GNU_SYSTEM + * debian/control: removed circular dependency, libgphoto2-port0 no longer + depends upon libgphoto2-2 (closes: #357796) + * debian/compat: bumped to 5 + + -- Frederic Peters Mon, 15 May 2006 12:51:43 +0200 + +libgphoto2 (2.1.6-8) unstable; urgency=low + + * packaging/linux-hotplug/print-udev-rules.c: removed BUS!=usb line since + BUS was not reported by udev. (closes: #360526) + + -- Frederic Peters Mon, 3 Apr 2006 11:26:47 +0200 + +libgphoto2 (2.1.6-7) unstable; urgency=low + + * camlibs/ptp2/library.c: added a bunch of Kodak camera (closes: #359298) + * camlibs/ptp2/library.c: added Nikon DSC D70s (closes: #321629) + * packaging/linux-hotplug/print-udev-rules.c: splitted match line + (closes: #359796) + * packaging/linux-hotplug/print-udev-rules.c: use dev facilities to change + ownership and permissions. (closes: #359799) + + -- Frederic Peters Wed, 29 Mar 2006 10:39:11 +0200 + +libgphoto2 (2.1.6-6) unstable; urgency=low + + * Acknowledge NMUs, thanks to all. + * debian/hotplug: changed hotplug script to support new udev and kernel + versions (thanks to Aleksey Kliger) (closes: #341083, #342279, #342282) + * debian/libgphoto2-2.postinst: don't generate udev rules if udev directory + doesn't exist (closes: #334578) + + -- Frederic Peters Thu, 8 Dec 2005 12:02:29 +0100 + +libgphoto2 (2.1.6-5.3) unstable; urgency=low + + * Non-Maintainer Upload. + * Disable cache - this reduces memory usage from 3Mb + ammount + of all files downloaded (which could be several Gb) down to + 3Mb + size of file that we currently download (Closes: #338880, #334581). + + -- Aigars Mahinovs Sun, 27 Nov 2005 08:20:22 +0200 + +libgphoto2 (2.1.6-5.2) unstable; urgency=low + + * Non-Maintainer Upload. + * Add /etc/udev/rules.d to libgphoto2-2.dirs (closes: #333678). + + -- Julien BLACHE Mon, 17 Oct 2005 18:50:22 +0200 + +libgphoto2 (2.1.6-5.1) unstable; urgency=low + + * Non-Maintainer Upload. + * Derived print-udev-rules from print-usb-usermap to generate the udev + rules file. + * debian/libgphoto2-2.postinst: call print-udev-rules, create the symlink + in /etc/udev/rules.d if needed (closes: #332936). + * debian/hotplug: use chown user:group instead of chown user.group. + * debian/control: libgphoto2-2 Recommends: udev | hotplug, do not conflict + with udev + + -- Julien BLACHE Mon, 10 Oct 2005 21:07:25 +0200 + +libgphoto2 (2.1.6-5) unstable; urgency=low + + * debian/control: conflicts with udev >= 0.070-3 since it would need a + linux 2.6.14 to get both working together. Crappy. (see: #332936) + + -- Frederic Peters Sun, 9 Oct 2005 19:55:34 +0200 + +libgphoto2 (2.1.6-4) unstable; urgency=low + + * camlibs/ptp2/library.c: ported (kludgy) patch to work with HP + PhotoSmart 850 (as requested by user). + Patch from https://bugzilla.ubuntu.com/show_bug.cgi?id=12132 + * debian/copyright: updated FSF address + + -- Frederic Peters Tue, 27 Sep 2005 20:18:31 +0200 + +libgphoto2 (2.1.6-3) unstable; urgency=low + + * debian/libgphoto2-2.postinst: print-usb-usermap location changed, use the + new location. (closes: #321031) + + -- Frederic Peters Wed, 3 Aug 2005 08:48:39 +0200 + +libgphoto2 (2.1.6-2) unstable; urgency=low + + * Rebuilt against new libexif12 + + -- Frederic Peters Wed, 27 Jul 2005 17:32:26 +0200 + +libgphoto2 (2.1.6-1) unstable; urgency=low + + * New upstream release. (closes: #316719) + * Removed Debian patches, applied upstream. + + -- Frederic Peters Wed, 6 Jul 2005 10:46:20 +0200 + +libgphoto2 (2.1.5-6) unstable; urgency=low + + * Fixes issues with PTP, big files and libusb 0.10 + http://sourceforge.net/tracker/index.php?func=detail&aid=1162373&group_id=8874&atid=108874 + (closes: #301945) + + -- Frederic Peters Sun, 15 May 2005 16:00:45 +0200 + +libgphoto2 (2.1.5-5) unstable; urgency=low + + * Patched to fix FTBFS on kfreebsd-gnu; original patch by Robert Millan. + (closes: #297894) + + -- Frederic Peters Tue, 8 Mar 2005 20:49:17 +0100 + +libgphoto2 (2.1.5-4) unstable; urgency=low + + * Patched sierra driver to work with new libusb package; many thanks to + Aurelien Jarno. (closes: #296708) + + -- Frederic Peters Sun, 27 Feb 2005 20:05:00 +0100 + +libgphoto2 (2.1.5-3) unstable; urgency=low + + * debian/libgphoto2-2.postinst: overwrite USB usermap on package + installation. (closes: #291836) + * debian/libgphoto2-2.README.Debian: point user to /etc/hotplug/usb.usermap + for local customizations. + * debian/control: removed 'The' in front of description synopsis + + -- Frederic Peters Thu, 27 Jan 2005 20:26:21 +0100 + +libgphoto2 (2.1.5-2) unstable; urgency=low + + * debian/libgphoto2-2.README.Debian: fixed print-usb-usermap command line. + (closes: #286829) + + -- Frederic Peters Wed, 22 Dec 2004 16:51:56 +0100 + +libgphoto2 (2.1.5-1) unstable; urgency=low + + * New upstream release. + * Removed Debian patches, applied upstream. + * debian/control: added pkg-config to libgphoto2-dev dependencies + * debian/libgphoto2-2.README.Debian: added a note about libgphoto2.usermap + file not being overwritten on upgrade. + + -- Frederic Peters Tue, 21 Dec 2004 16:00:24 +0100 + +libgphoto2 (2.1.4-10) unstable; urgency=low + + * libgphoto2_port/configure.in: removed syntax error that caused ABOUT-NLS + to be executed (and a non-fatal error when running configure) and reran + autoconf. (closes: #284351) + * debian/rules: fixed typo (2>&1, not 2>1) + + -- Frederic Peters Sun, 5 Dec 2004 21:23:36 +0100 + +libgphoto2 (2.1.4-9) unstable; urgency=low + + * debian/canon-ixus-500-ptp.patch: support for Canon Ixus 500 (PTP mode) + + -- Frederic Peters Tue, 19 Oct 2004 11:09:47 +0200 + +libgphoto2 (2.1.4-8) unstable; urgency=low + + * debian/control: Depends on adduser (for addgroup) (closes: #273432) + + -- Frederic Peters Sun, 26 Sep 2004 08:58:10 +0200 + +libgphoto2 (2.1.4-7) unstable; urgency=low + + * Adopted package; thanks Christophe for all that maintainership. + * Merged Ubuntu patches (group changed from 'plugdev' to 'camera'): + * Added hotplug script debian/hotplug and install it; this gives access + permissions to 'camera' group members, and does nothing if the group + does not exist. (closes: #175073, #272658) + * Added libgphoto2-2 postinst which creates USB usermap. + * Added libgphoto2-2 postrm which deletes USB usermap on purge. + * Updated libgphoto2-2.README.Debian to describe the changes. + * Martin Pitt did those + * debian/control: slighlty reworded some descriptions. + * debian/canon-powershot-a75.patch: support for Canon Powershot A75 + (closes: #260279) + * debian/libgphoto2-2.postinst: creates 'camera' group. + * debian/rules: keeps linux-hotplug scripts in /usr/share/doc/ but no longer + chmod +x them. + + -- Frederic Peters Thu, 23 Sep 2004 11:07:08 +0200 + +libgphoto2 (2.1.4-6) unstable; urgency=low + + * Rebuilt against libexif10. + + -- christophe barbe Fri, 28 May 2004 16:43:59 -0400 + +libgphoto2 (2.1.4-5) unstable; urgency=low + + * Make example scripts executable. + * Update README.Debian (Closes: #241327). + + -- christophe barbe Wed, 31 Mar 2004 20:35:16 -0500 + +libgphoto2 (2.1.4-4) unstable; urgency=low + + * Added missing libjpeg build dependency (Closes: #234668). + + -- christophe barbe Fri, 27 Feb 2004 13:28:46 -0500 + +libgphoto2 (2.1.4-3) unstable; urgency=low + + * Dropped xmlto dependency. + + -- christophe barbe Mon, 16 Feb 2004 13:42:04 -0500 + +libgphoto2 (2.1.4-2) unstable; urgency=low + + * Build against newest libusb 0.1.8. + * Changed rules to ease debug builds. + * Fixed download of large AVI with Canon cams (Closes: #232453) + (+ support for Canon MV650i). + + -- christophe barbe Sun, 15 Feb 2004 18:50:48 -0500 + +libgphoto2 (2.1.4-1) unstable; urgency=low + + * New Upstream Release. + + -- christophe barbe Sun, 18 Jan 2004 18:55:12 -0500 + +libgphoto2 (2.1.3-2) unstable; urgency=low + + * Added missing canon A300 and S50 cameras. + * Fixed broken hotplug example script (Closes: #218271). + * Updated sq905 driver from CVS HEAD. + + -- christophe barbe Sun, 2 Nov 2003 18:08:21 -0500 + +libgphoto2 (2.1.3-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Sun, 26 Oct 2003 17:40:53 -0500 + +libgphoto2 (2.1.2-5) unstable; urgency=low + + * Fix progress code in the ptp2 driver (Closes: #214164). + + -- christophe barbe Tue, 14 Oct 2003 19:32:40 -0400 + +libgphoto2 (2.1.2-4) unstable; urgency=low + + * Raise priority from extra to optional (Closes: #215459). + * Spelling fixes, thanks to Helge Kreutzmann (Closes: #214166). + * I will not run update-usb.usermap (intented to be used by the + front-end application) during the post-installation of the library + (Closes: #214165). + + -- christophe barbe Mon, 13 Oct 2003 17:57:19 -0400 + +libgphoto2 (2.1.2-3) unstable; urgency=low + + * Fix Canon S45 usb IDs (Closes: #207092). + + -- christophe barbe Mon, 13 Oct 2003 17:57:17 -0400 + +libgphoto2 (2.1.2-2) unstable; urgency=low + + * Workaround m68k bug (free_mem.patch). + + -- christophe barbe Tue, 12 Aug 2003 20:33:46 -0400 + +libgphoto2 (2.1.2-1) unstable; urgency=low + + * New upstream release. + + -- christophe barbe Mon, 11 Aug 2003 18:03:02 -0400 + +libgphoto2 (2.1.1-10) unstable; urgency=low + + * Rebuild against libexif9 (Closes: #204184). + libgphoto2 2.1.2 is coming RSN. + + -- christophe barbe Tue, 5 Aug 2003 07:14:12 -0400 + +libgphoto2 (2.1.1-9) unstable; urgency=low + + * Compiled without libltld3 to make digikam stable (Closes: 185989). + * Updated to Debian Policy Standards-Version 3.5.9 (no change). + + -- christophe barbe Tue, 5 Aug 2003 07:14:09 -0400 + +libgphoto2 (2.1.1-8) unstable; urgency=low + + * Install libgphoto2-port0 AUTHORS in the correct directory + (Closes: #180774). + + -- christophe barbe Wed, 12 Feb 2003 13:40:11 -0500 + +libgphoto2 (2.1.1-7) unstable; urgency=low + + * Fix Kodak LS443 USB id (Closes: #180202). + + -- christophe barbe Mon, 10 Feb 2003 18:24:24 -0500 + +libgphoto2 (2.1.1-6) unstable; urgency=low + + * No more need of gtk-doc-tools. + + -- christophe barbe Wed, 22 Jan 2003 20:38:18 -0500 + +libgphoto2 (2.1.1-5) unstable; urgency=low + + * Make sure libgphoto2 and gphoto2 use the same libexif. + + -- christophe barbe Wed, 22 Jan 2003 15:24:04 -0500 + +libgphoto2 (2.1.1-4) unstable; urgency=low + + * Rebuild against new libexif. + + -- christophe barbe Mon, 20 Jan 2003 17:15:21 -0500 + +libgphoto2 (2.1.1-3) unstable; urgency=low + + * Add missing dependency libexif-dev (Closes: #174229). + * Fix path in README file (Closes: #172569). + + -- christophe barbe Tue, 24 Dec 2002 22:46:46 -0500 + +libgphoto2 (2.1.1-2) unstable; urgency=low + + * Added a versioned dependency on libltdl3 (>= 1.4.3) so that impatient + testing users get a working package (Closes: #171934). + NOTE: This is a libltdl3 bug, see bug #171843. + + -- christophe barbe Thu, 5 Dec 2002 23:15:15 -0500 + +libgphoto2 (2.1.1-1) unstable; urgency=low + + * New Upstream release. + + -- christophe barbe Sun, 1 Dec 2002 18:38:22 -0500 + +libgphoto2 (2.1.0.99-1) unstable; urgency=low + + * First upload (Closes: #170809). + + -- christophe barbe Tue, 26 Nov 2002 17:03:45 -0500 + --- libgphoto2-2.4.2.orig/debian/libgphoto2-2.NEWS +++ libgphoto2-2.4.2/debian/libgphoto2-2.NEWS @@ -0,0 +1,25 @@ +libgphoto2 (2.2.1-9) unstable; urgency=low + + libgphoto2 udev and hotplug scripts will now use the 'plugdev' group instead + of the 'camera' group. + + Rationale is: + + 1) The convenience of using the plugdev group is that it is already + created by the installer for the first user, hence less work and + confusion for users. + + 2) Most users probably mentally group cameras with their other pluggable + devices, and I can't imagine a situation where the admin would grant + local access to cameras but not USB sticks, or vice versa. It's either + a desktop system or it isn't, and plugdev is the group for desktops. + + 3) A lot of cameras (most?) are also USB mass storage devices, and thus + can be mounted by the user if he/she is in plugdev, so the separation + of plugdev and camera doesn't add anything security-wise. + + (thanks to Christopher Martin for this rationale summary). + + As a side effect this brings Debian and Ubuntu in sync on this matter. + + -- Frederic Peters Thu, 26 Oct 2006 20:11:37 +0200 --- libgphoto2-2.4.2.orig/debian/libgphoto2-port0.files +++ libgphoto2-2.4.2/debian/libgphoto2-port0.files @@ -0,0 +1,6 @@ +usr/share/locale/*/LC_MESSAGES/libgphoto2_port-0.mo +usr/share/doc/libgphoto2_port/AUTHORS +usr/share/doc/libgphoto2_port/README +usr/share/doc/libgphoto2_port/NEWS +usr/lib/libgphoto2_port.so* +usr/lib/libgphoto2_port/*/{serial,usb,disk,ptpip}.so --- libgphoto2-2.4.2.orig/debian/compat +++ libgphoto2-2.4.2/debian/compat @@ -0,0 +1 @@ +5 --- libgphoto2-2.4.2.orig/debian/libgphoto2-2-dev.files +++ libgphoto2-2.4.2/debian/libgphoto2-2-dev.files @@ -0,0 +1,13 @@ +usr/share/doc/libgphoto2/apidocs.html/ +usr/share/doc/libgphoto2/README.apidocs +usr/share/man/man3/libgphoto2.3 +usr/share/man/man3/libgphoto2_port.3 +usr/lib/libgphoto2_port.{so,a} +usr/lib/libgphoto2_port/*/{serial,usb,disk,ptpip}.{la,a} +usr/lib/libgphoto2.{so,a} +usr/lib/pkgconfig/libgphoto2.pc +usr/lib/pkgconfig/libgphoto2_port.pc +usr/lib/libgphoto2/*/*.{la,a} +usr/include/gphoto2/*.h +usr/bin/gphoto2-port-config +usr/bin/gphoto2-config --- libgphoto2-2.4.2.orig/debian/watch +++ libgphoto2-2.4.2/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://sf.net/gphoto/libgphoto2-([\d\.]*)\.tar\.gz --- libgphoto2-2.4.2.orig/debian/rules +++ libgphoto2-2.4.2/debian/rules @@ -0,0 +1,126 @@ +#!/usr/bin/make -f +# Sample debian/rules that uses debhelper. +# GNU copyright 1997 to 1999 by Joey Hess. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This version at least shares the same ABI, used in the dh_makeshlibs calls. +SHLIBS=2.4.0 + +include /usr/share/dpatch/dpatch.make + +DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) +ifeq ($(DEB_HOST_ARCH_OS),) + DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)) + ifeq ($(DEB_HOST_ARCH_OS),gnu) + DEB_HOST_ARCH_OS := hurd + endif +endif + +ifeq ($(DEB_HOST_ARCH_OS),hurd) + CONFIGURE_OPTIONS += --without-libusb +endif + +major=2 + +CFLAGS = -g + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +configure: configure-stamp +configure-stamp: patch-stamp + dh_testdir + CFLAGS="$(CFLAGS)" ./configure --prefix=/usr --sysconfdir=/etc --mandir=\$${prefix}/share/man --with-drivers=all --enable-static $(CONFIGURE_OPTIONS) + touch configure-stamp + +build: build-stamp +build-stamp: configure-stamp + dh_testdir + #$(MAKE) all-local # necessary to get headers into gphoto2/ + $(MAKE) + touch build-stamp + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-stamp configure-stamp + [ ! -f Makefile ] || $(MAKE) distclean + rm -f config.log config.status confdefs.h + rm -f libgphoto2_port/config.log libgphoto2_port/config.status + -rm -rf `pwd`/debian/tmp `pwd`/debian/libgphoto2 `pwd`/debian/libgphoto2-dev + rm -f po/stamp-po po/*.gmo + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + export LIBRARY_PATH=`pwd`/debian/tmp/usr/lib; $(MAKE) install prefix=`pwd`/debian/tmp/usr + + # remove upstream 0-byte files to make lintian happy + -find debian/tmp/ -size 0 -exec rm '{}' ';' + + # Ok the GPL is already on the target system + rm debian/tmp/usr/share/doc/libgphoto2/COPYING + + # remove the recursive symlink + rm debian/tmp/usr/include/gphoto2/gphoto2 + + dh_movefiles + + mv debian/libgphoto2-$(major)/usr/share/doc/libgphoto2 \ + debian/libgphoto2-$(major)/usr/share/doc/libgphoto2-$(major) + mv debian/libgphoto2-port0/usr/share/doc/libgphoto2_port \ + debian/libgphoto2-port0/usr/share/doc/libgphoto2-port0 + install -D packaging/generic/check-ptp-camera debian/libgphoto2-$(major)/lib/udev/check-ptp-camera + rm debian/tmp/usr/lib/udev/check-ptp-camera + -test -e debian/tmp/usr/lib/udev/check-mtp-device && \ + mkdir -p debian/libgphoto2-port0/lib/udev && \ + mv debian/tmp/usr/lib/udev/check-mtp-device \ + debian/libgphoto2-port0/lib/udev/check-mtp-device + + # remove *.la files before trying to remove debian/tmp + find debian/tmp/usr/lib -name '*.la' -maxdepth 1 -type f -delete + + -find debian/tmp -type d | sort -r | xargs rmdir 2>&1 > /dev/null + # debian/tmp should be empty here : if not fail: + test ! -d debian/tmp + +binary-indep: build install +# We have nothing to do by default. + +binary-arch: build install + dh_testdir -a + dh_testroot -a + dh_installdocs doc/DAEMON + dh_installchangelogs ChangeLog + dh_link -a + dh_strip -a + dh_compress -a + dh_fixperms -a --exclude usbcam + # By comparing the symbols, a strict dependency on the latest upstream version + # can be avoided. $SHLIBS represents the latest version with the same ABI, and + # is set at the top of this file. + dh_makeshlibs -plibgphoto2-$(major) -V 'libgphoto2-$(major) (>= $(SHLIBS))' + dh_makeshlibs -plibgphoto2-port0 -V 'libgphoto2-port0 (>= $(SHLIBS))' + dh_installdeb + dh_shlibdeps -ldebian/libgphoto2-$(major)/usr/lib/:debian/libgphoto2-port0/usr/lib/ + dh_gencontrol -plibgphoto2-$(major)-dev + dh_gencontrol -plibgphoto2-port0 + dh_gencontrol -plibgphoto2-$(major) + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- libgphoto2-2.4.2.orig/debian/libgphoto2-2.postrm +++ libgphoto2-2.4.2/debian/libgphoto2-2.postrm @@ -0,0 +1,25 @@ +#! /bin/sh + +PACKAGE="libgphoto2" + +set -e + +case "$1" in + remove|purge) + rm -f /etc/hotplug/usb/$PACKAGE.usermap + rm -f /usr/share/hal/fdi/information/20thirdparty/$PACKAGE.fdi || /bin/true + rm -f /usr/share/hal/fdi/information/10freedesktop/10-camera-$PACKAGE.fdi || /bin/true + rm -f /usr/share/hal/fdi/information/10freedesktop/10-camera-$PACKAGE-device.fdi || /bin/true + rm -f /usr/share/hal/fdi/preprobe/10osvendor/20-$PACKAGE.fdi || /bin/true + ;; + disappear|upgrade|failed-upgrade|abort-install|abort-upgrade) + ;; + + *) + echo "postrm called with unknown argument \`$1'" >&2 + exit 1 +esac + +#DEBHELPER# + +exit 0 --- libgphoto2-2.4.2.orig/debian/libgphoto2-2.dirs +++ libgphoto2-2.4.2/debian/libgphoto2-2.dirs @@ -0,0 +1 @@ +etc/udev/rules.d --- libgphoto2-2.4.2.orig/debian/libgphoto2-2.postinst +++ libgphoto2-2.4.2/debian/libgphoto2-2.postinst @@ -0,0 +1,32 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +PACKAGE="libgphoto2" + +case "$1" in + configure) + # create FDI file + mkdir -p /usr/share/hal/fdi/preprobe/10osvendor/ || true + /usr/lib/$PACKAGE/print-camera-list hal-fdi > \ + /usr/share/hal/fdi/preprobe/10osvendor/20-$PACKAGE.fdi + + # remove old fdi files + rm -f /usr/share/hal/fdi/information/10freedesktop/10-camera-$PACKAGE.fdi + rm -f /usr/share/hal/fdi/information/20thirdparty/$PACKAGE.fdi + rm -f /usr/share/hal/fdi/information/10freedesktop/10-camera-$PACKAGE-device.fdi + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + + +exit 0 + --- libgphoto2-2.4.2.orig/debian/libgphoto2-2.files +++ libgphoto2-2.4.2/debian/libgphoto2-2.files @@ -0,0 +1,7 @@ +usr/share/locale/*/LC_MESSAGES/libgphoto2-2.mo +usr/share/doc/libgphoto2/* +usr/share/libgphoto2/*/konica/* +usr/lib/libgphoto2/*/*.so +usr/lib/libgphoto2.so.* +usr/lib/libgphoto2/*/libgphoto2_*.so +usr/lib/libgphoto2/print-camera-list --- libgphoto2-2.4.2.orig/debian/control +++ libgphoto2-2.4.2/debian/control @@ -0,0 +1,72 @@ +Source: libgphoto2 +Section: libs +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Debian PhotoTools Maintainers +Uploaders: Frederic Peters , Cyril Brulebois +Build-Depends: debhelper (>> 5.0.0), + dpatch, + type-handling, + libtool, + libltdl7-dev, + zlib1g-dev, + libusb-dev (>= 1:0.1.5) [!hurd-i386], + libgpmg1-dev | not+linux-gnu, + pkg-config, + libexif-dev (>= 0.5.9), + libjpeg62-dev, + libhal-dev (>= 0.5.0) | not+linux-gnu, + doxygen, + graphviz, + libdbus-1-dev +Build-Conflicts: liblockdev1-dev +Standards-Version: 3.8.0 +Vcs-Browser: http://git.debian.org/?p=pkg-phototools/libgphoto2.git +Vcs-Git: git://git.debian.org/git/pkg-phototools/libgphoto2.git +Homepage: http://www.gphoto.org/proj/libgphoto2/ + +Package: libgphoto2-2-dev +Section: libdevel +Architecture: any +Provides: libgphoto2port-dev, libgphoto2-dev +Replaces: libgphoto2port-dev, libgphoto2-dev +Conflicts: libgphoto2port-dev, gphoto2-dev (<= 2.1.1) +Depends: libgphoto2-2 (= ${binary:Version}), libexif-dev, libusb-dev [!hurd-i386], libc-dev, pkg-config +Description: gphoto2 digital camera library (development files) + The gphoto2 library can be used by applications to access various + digital camera models, via standard protocols such as USB Mass Storage + and PTP, or vendor-specific protocols. + . + This package contains the development files. + +Package: libgphoto2-port0 +Section: libs +Architecture: any +Provides: libgphoto2port +Replaces: libgphoto2port +Conflicts: libgphoto2port, gphoto2 (<= 2.1.1) +Depends: ${shlibs:Depends} +Suggests: gphoto2 (>> 2.1.0), gtkam +Description: gphoto2 digital camera port library + The gphoto2 library can be used by applications to access various + digital camera models, via standard protocols such as USB Mass Storage + and PTP, or vendor-specific protocols. + . + This package contains the runtime code for port access. + +Package: libgphoto2-2 +Section: libs +Architecture: any +Conflicts: gphoto2 (<= 2.1.1) +Depends: ${shlibs:Depends}, adduser +Recommends: hal (>= 0.5.10-5ubuntu1) +Suggests: gphoto2 (>= 2.1.1) +Description: gphoto2 digital camera library + The gphoto2 library can be used by applications to access various + digital camera models, via standard protocols such as USB Mass Storage + and PTP, or vendor-specific protocols. + . + This package contains the library. + . + The gphoto2 command-line frontend is shipped separately, in the gphoto2 + package. --- libgphoto2-2.4.2.orig/debian/copyright +++ libgphoto2-2.4.2/debian/copyright @@ -0,0 +1,476 @@ +X-Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +X-Debianized-By: Christophe Barbe +X-Debianized-Date: Mon Nov 4 11:07:49 CEST 2002. +X-Original-Source-Location: http://www.gphoto.org/download/ + + + +Files: * +License: LGPL-2+ + + + +Files: camlibs/* +X-Comment: licensecheck'd. + +Files: camlibs/adc65/* +Copyright: © 2001 Benjamin Moos +License: GPL-2 + +Files: camlibs/agfa-cl20/* +Copyright: © 2002-2003 Philipp Poeml + © 2002-2003 Dennis Noordsij +License: LGPL-2+ + +Files: camlibs/aox/* +Copyright: © 2003 Theodore Kilgore +License: LGPL-2+ + +Files: camlibs/barbie/* +Copyright: NONE +License: NONE + +Files: camlibs/canon/* +Copyright: © 1999 Wolfgang G. Reissnegger + © 1999 Werner Almesberger + © 2000 Philippe Marzouk + © 2000 Edouard Lafargue + © 2000 Mikael Nyström +License: NONE + +Files: camlibs/casio/* +Copyright: © 2001 Lutz Müller + © 2004 Michael Haardt +License: LGPL-2+ + +Files: camlibs/casio/cam2jpgtab.h, + camlibs/casio/jpegtab_f.h +Copyright: TODO: Missing years. + © Ken-ichi HAYASHI + © Jun-ichiro "itojun" Itoh +License: TODO + | This file is taken from qvplay version 0.95, written by: + | + | Ken-ichi HAYASHI + | Jun-ichiro "itojun" Itoh + | + | Notes from qvplay: + | + | You can use the entire source code of this archive in your software, + | but I assume no resuponsibilitiy for the results of the usage of the + | source code. + | Use at your own risk. + | + | If you want to need some kind of 'license', + | you can choice 'BSD style license' or 'LGPL'. + | It is great presure you describe at README file of your software, + | "This software has QVplay's source code.". + +Files: camlibs/clicksmart310/* +Copyright: © 2006 Theodore Kilgore +License: LGPL-2+ + +Files: camlibs/digigr8/* +Copyright: © 2005, 2007 Theodore Kilgore +License: LGPL-2+ + +Files: camlibs/digita/* +Copyright: © 1999-2001 Johannes Erdfelt +License: LGPL-2+ + +Files: camlibs/dimera/* +Copyright: © 2000-2001 Brian Beattie + © 2000-2001 Chuck Homic + © 2000-2001 Gregg Berg +License: TODO. Not DFSG-free. + | * Permission to copy and use and modify this file is granted + | * provided the above notices are retained, intact. + +Files: camlibs/directory/* +Copyright: © 2001 Lutz Müller + © 2005 Marcus Meissner + © 2007 Hubert Figuiere +License: LGPL-2+ + +Files: camlibs/enigma13/* +Copyright: © 2004 Olivier Fauchon +License: LGPL-2+ + +Files: camlibs/fuji/* +Copyright: © 1997 Mamoru Ohno + © 1998 Matthew G. Martin + © 2002 Lutz Müller +License: LGPL-2+ + +Files: camlibs/gsmart300/* +Copyright: © 2002 Jérôme Lodewyck +License: LGPL-2+ + +Files: camlibs/hp215/* +Copyright: © 1986 Stephen Satchell + © 2002 Jason Surprise + © 2003 Enno Bartels + © 2005 Marcus Meissner +License: LGPL-2+ + +Files: camlibs/iclick/* +Copyright: © 2004 Theodore Kilgore + © 2004 Stephen Pollei +License: LGPL-2+ + +Files: camlibs/jamcam/* +Copyright: © 2001 Chris Pinkham +License: LGPL-2+ + +Files: camlibs/jd11/* +Copyright: © 1999-2001 Marcus Meissner +License: LGPL-2+ + +Files: camlibs/kodak/* +Copyright: NONE or improper copyright statements. +License: NONE or improper copyright statements. + +Files: camlibs/kodak/ez200/ez200.c +Copyright: © 2004 Bucas Jean-François +License: LGPL-2+ + +Files: camlibs/konica/* +Copyright: © 2001 Lutz Müller + © 2003 Marcus Meissner + © 2003 Aurélien Croc (AP²C) +License: LGPL-2+ + +Files: camlibs/largan/* +Copyright: © 2001 Lutz Müller + © 2002 Hubert Figuiere +License: LGPL-2+ + +Files: camlibs/lg_gsm/* +Copyright: © 2003 Theodore Kilgore + © 2005 Guillaume Bedot +License: LGPL-2+ + +Files: camlibs/mars/* +Copyright: © 2003, 2004, 2008 Theodore Kilgore + © 2008 Amauri Magagna +License: LGPL-2+ + +Files: camlibs/minolta/* +Copyright: © 2000,2001 Gus Hartmann +License: GPL-2+ + +Files: camlibs/mustek/* +Copyright: © 1999, 2000 Henning Zabel + © 2001 Marcus Meissner +License: GPL-2+ + +Files: camlibs/panasonic/* +Copyright: © 1999 Galen Brooks + © 2000 Fredrik Roubert + © 2000 Mariusz Zynel + © 2001 Chris Pinkham + © 2001 Andrew Selkirk +License: LGPL-2+ + +Files: camlibs/pccam300/* +Copyright: TODO: Missing years. + © Till Adam + © Miah Gregory +License: LGPL-2+ + +Files: camlibs/pccam600/* +Copyright: TODO: Missing years. + © Peter Kajberg +License: LGPL-2+ + +Files: camlibs/polaroid/* +Copyright: © 2001 Lutz Müller + © 2001 Michael Trawny + © 2002 Marcus Meissner + © 2003 Mark Slemko +License: LGPL-2+ + +Files: camlibs/polaroid/jpeghead.h +Copyright: TODO: Missing years. + © Nathan Stenzel +License: NONE + +Files: camlibs/ptp2/* +Copyright: © 2001-2005 Mariusz Woloszyn + © 2003-2007 Marcus Meissner + © 2005-2006 Hubert Figuiere + © 2006 Linus Walleij +License: LGPL-2+ + +Files: camlibs/ricoh/* +Copyright: © 2002 Lutz Müller + © 2003 Marcus Meissner +License: LGPL-2+ + +Files: camlibs/ricoh/crctab.h +Copyright: © 1986 Stephen Satchell + © 1986 Gary S. Brown +License: TODO. Not DFSG-free. + | /* + | * Copyright © 1986 Gary S. Brown. You may use this program, or + | * code or tables extracted from it, as desired without restriction. + | */ + +Files: camlibs/samsung/* +Copyright: © 2000 James McKenzie + © 2001 Lutz Müller + © 2002 Marcus Meissner +License: LGPL-2+ + +Files: camlibs/sierra/* +Copyright: TODO: Missing years. + © 2001 Lutz Müller + © 2002 Patrick Mansfield + © David Selmeczi + © Till Kamppeter +License: LGPL-2+ + +Files: camlibs/sipix/* +Copyright: © 2002 Vincent Sanders + © 2002, 2003 Marcus Meissner +License: LGPL-2+ + +Files: camlibs/smal/* +Copyright: © 2003 Lee Benfield +License: LGPL-2+ + +Files: camlibs/sonix/* +Copyright: © 2005 Theodore Kilgore +License: LGPL-2+ + +Files: camlibs/sonydscf1/* +Copyright: NONE +License: NONE + +Files: camlibs/sonydscf55/* +Copyright: © 2000 Mark Davies + © 2001, 2002, 2004 Raymond Penners +License: LGPL-2+ + +Files: camlibs/soundvision/* +Copyright: © 1999-2000 Johannes Erdfelt, VA Linux Systems + © 2001-2003 Vince Weaver +License: NONE + +Files: camlibs/spca50x/* +Copyright: © 2002, 2003 Till Adam + © 2002, 2003 Ian MacArthur + © 2002, 2003 John Maushammer + © 2002, 2003 Mark A. Zimmerman +License: LGPL-2+ + +Files: camlibs/sq905/* +Copyright: © 2003 Theodore Kilgore +License: LGPL-2+ + +Files: camlibs/stv0674/* +Copyright: © 2000 Adam Harrison + © 2000, 2002 Vince Sanders +License: LGPL-2+ + +Files: camlibs/stv0680/* +Copyright: © 2000 Adam Harrison +License: LGPL-2+ + +Files: camlibs/stv0680/demosaic_sharpen.c +Copyright: © 2002 Kurt Garloff +License: GPL but improper license statements. + +Files: camlibs/stv0680/saturate.{c,h} +Copyright: © 1995 Spencer Kimball + © 1995 Peter Mattis +License: GPL-2+ + +Files: camlibs/stv0680/sharpen.c +Copyright: © 1997-1998 Michael Sweet +License: GPL-2+ + +Files: camlibs/sx330z/* +Copyright: © 2002 Dominik Kuhlen +License: LGPL-2+ + +Files: camlibs/template/* +Copyright: © 2001 Lutz Müller + © 2005 Hans Ulrich Niedermann +License: LGPL-2+ + +Files: camlibs/toshiba/* +Copyright: © 2003 David Hogue +License: LGPL-2+ + + + +Files: doc/* +Copyright: © 2000 Scott Fritzinger + +Files: doc/api/gphoto2-api.sgml +Copyright: © 2000 The Free Software Foundation +License: LGPL-1.1+ + | Permission is granted to copy, distribute and/or modify this + | document under the terms of the GNU Free Documentation + | License, Version 1.1 or any later version published by the + | Free Software Foundation with no Invariant Sections, no + | Front-Cover Texts, and no Back-Cover Texts. +X-Comment: LGPL-2+ is being chosen to comply with the DFSG. For the + complete license text, see: /usr/share/common-licenses/LGPL-2 + + + +Files: gphoto2/* +Copyright: © 2000-2001 Scott Fritzinger + © 2001 Lutz Müller + © 2002 Hans Ulrich Niedermann +License: LGPL-2+ + + + +Files: libgphoto2_port/* +Copyright: © 1999 Beat Christen + © 1999 Scott Fritzinger + © 1999-2000 Johannes Erdfelt + © 2000 Philippe Marzouk + © 2000 Edouard Lafargue + © 2001-2002 Lutz Müller + © 2002 Hans Ulrich Niedermann + © 2005, 2007 Hubert Figuiere + © 2006 Marcus Meissner +License: LGPL-2+ +X-Comment: licensecheck'd. + + + +Files: libgphoto2/* +Copyright: TODO: Missing years. + © 2000 Scott Fritzinger + © 2001-2002 Lutz Müller + © 2002 Hans Ulrich Niedermann + © 2007 Theodore Kilgore + © Nathan Stenzel +License: LGPL-2+ + +Files: libgphoto2/exif.c +Copyright: © 1999 Matthew G. Martin +License: GPL-2+ + + + +Files: m4m/* +Copyright: NONE +License: NONE + +Files: m4m/gp-byteorder.m4, m4m/gp-stdint.m4 +Copyright: © 2001-2002 by Dan Fandrich +License: Not DFSG free. + | dnl Copyright 2001-2002 by Dan Fandrich + | dnl This file may be copied and used freely without restrictions. No warranty + | dnl is expressed or implied. + + + +Files: packaging/* +Copyright: NONE +License: NONE + +Files: packaging/generic/print-camera-list.c +Copyright: © 2002,2005 Hans Ulrich Niedermann + © 2002 Lutz Müller + © 2005 Julien BLACHE +License: LGPL-2+ + +Files: packaging/linux-hotplug/gphoto-set-procperm +Copyright: NONE +License: NONE + | # This is taken from Fedora Core gphoto2 package. + | # http://cvs.fedora.redhat.com/viewcvs/*checkout*/devel/gphoto2/gphoto-set-procperm + +Files: packaging/rpm/Makefile.am +Copyright: © 2001 Hans Ulrich Niedermann +License: NONE + + + +Files: po/* +License: LGPL-2+ (same as the package itself). + +Files: po/da.po +Copyright: © 2000 Keld Simonsen + © 2000 Kenneth Christiansen + © 2007 Mogens Jaeger + © 2000, 2007 Free Software Foundation, Inc. + +Files: po/de.po +Copyright: © 2000-2002 Scott Fritzinger et al. + © 2000 Lutz Müller + © 2001-2002 Colin Marquardt + © 2003-2007 Marcus Meissner + +Files: po/es.po +Copyright: © 2002-2003 Fabian Mandelbaum + © 2004 Quique + +Files: po/eu.po +Copyright: © 2005 Free Software Foundation, Inc. + © 2005 Hizkuntza Politikarako Sailburuordetza + +Files: po/fr.po +Copyright: © 2001 Jérôme Fenal + © 2003 Aurélien Croc + +Files: po/hu.po +Copyright: © 2003 Tamas Szanto + +Files: po/it.po +Copyright: © 2000, 2005, 2006, 2007 Free Software Foundation, Inc. + © 2005, 2006, 2007 Marco Colombo + © 2000 Daniele Medri + +Files: po/ja.po +Copyright: © 2000-2002, 2004 Free Software Foundation, Inc. + © 2000 Yukihiro Nakai + © 2001-2002, 2004 Takeshi Aihana + © 2002 AMANO Kazuhiro + +Files: po/nb.po +Copyright: © 2000 Free Software Foundation, Inc. + © 2000 Kjartan Maraas + +Files: po/nl.po +Copyright: © 2006 Free Software Foundation, Inc. + © 2006 Kurt De Bree + +Files: po/pl.po +Copyright: © 2006, 2007 Free Software Foundation, Inc. + © 2006, 2007 Jakub Bogusz + +Files: po/ru.po +Copyright: © 2000 Free Software Foundation, Inc. + © 2005 Vyacheslav Dikonov + © 2005 Alexandre Prokoudine + +Files: po/sl.po +Copyright: © 2000 Free Software Foundation, Inc. + © 2000 Andraz Tori + +Files: po/sv.po +Copyright: © 2000 Free Software Foundation, Inc. + © 2000 Andreas Hyden + © 2002 Stefan Björnelund + © 2002 Sverker Wiberg + +Files: po/uk.po +Copyright: © 2000 Free Software Foundation, Inc. + © 2000 Yuri Syrota + © 2005-2007 Maxim V. Dziumanenko + +Files: po/vi.po +Copyright: © 2007 Free Software Foundation, Inc. + © 2007 Clytie Siddall + +Files: po/zh_CN.po +Copyright: © 2002 Wang Li --- libgphoto2-2.4.2.orig/debian/patches/70_increase_max_entries.dpatch +++ libgphoto2-2.4.2/debian/patches/70_increase_max_entries.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 70_increase_max_entries.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad libgphoto2-2.4.0~/libgphoto2/gphoto2-list.c libgphoto2-2.4.0/libgphoto2/gphoto2-list.c +--- libgphoto2-2.4.0~/libgphoto2/gphoto2-list.c 2007-07-27 02:35:31.000000000 +0200 ++++ libgphoto2-2.4.0/libgphoto2/gphoto2-list.c 2007-09-28 20:09:31.392540127 +0200 +@@ -72,7 +72,7 @@ + + #ifdef CAMERALIST_STRUCT_COMPATIBILITY + +-#define MAX_ENTRIES 1024 ++#define MAX_ENTRIES 8192 + #define MAX_LIST_STRING_LENGTH 128 + struct _CameraList { + int count; --- libgphoto2-2.4.2.orig/debian/patches/deprecated_lt_dlcaller_register.dpatch +++ libgphoto2-2.4.2/debian/patches/deprecated_lt_dlcaller_register.dpatch @@ -0,0 +1,145 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## deprecated_lt_dlcaller_register.dpatch by Devid Filoni +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad libgphoto2-2.4.2~/configure libgphoto2-2.4.2/configure +--- libgphoto2-2.4.2~/configure 2008-07-27 23:44:07.000000000 +0200 ++++ libgphoto2-2.4.2/configure 2008-07-28 00:55:22.000000000 +0200 +@@ -20506,9 +20506,9 @@ + + fi + if test $ac_cv_header_ltdl_h = yes; then +- { echo "$as_me:$LINENO: checking for lt_dlcaller_register in -lltdl" >&5 +-echo $ECHO_N "checking for lt_dlcaller_register in -lltdl... $ECHO_C" >&6; } +-if test "${ac_cv_lib_ltdl_lt_dlcaller_register+set}" = set; then ++ { echo "$as_me:$LINENO: checking for lt_dlinterface_register in -lltdl" >&5 ++echo $ECHO_N "checking for lt_dlinterface_register in -lltdl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_ltdl_lt_dlinterface_register+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20526,11 +20526,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char lt_dlcaller_register (); ++char lt_dlinterface_register (); + int + main () + { +-return lt_dlcaller_register (); ++return lt_dlinterface_register (); + ; + return 0; + } +@@ -20553,21 +20553,21 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- ac_cv_lib_ltdl_lt_dlcaller_register=yes ++ ac_cv_lib_ltdl_lt_dlinterface_register=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_ltdl_lt_dlcaller_register=no ++ ac_cv_lib_ltdl_lt_dlinterface_register=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlcaller_register" >&5 +-echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlcaller_register" >&6; } +-if test $ac_cv_lib_ltdl_lt_dlcaller_register = yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlinterface_register" >&5 ++echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinterface_register" >&6; } ++if test $ac_cv_lib_ltdl_lt_dlinterface_register = yes; then + LTDLINCL="" + LIBLTDL="-lltdl" + +diff -urNad libgphoto2-2.4.2~/libgphoto2_port/configure libgphoto2-2.4.2/libgphoto2_port/configure +--- libgphoto2-2.4.2~/libgphoto2_port/configure 2008-07-08 23:14:48.000000000 +0200 ++++ libgphoto2-2.4.2/libgphoto2_port/configure 2008-07-28 00:57:49.000000000 +0200 +@@ -20076,9 +20076,9 @@ + + fi + if test $ac_cv_header_ltdl_h = yes; then +- { echo "$as_me:$LINENO: checking for lt_dlcaller_register in -lltdl" >&5 +-echo $ECHO_N "checking for lt_dlcaller_register in -lltdl... $ECHO_C" >&6; } +-if test "${ac_cv_lib_ltdl_lt_dlcaller_register+set}" = set; then ++ { echo "$as_me:$LINENO: checking for lt_dlinterface_register in -lltdl" >&5 ++echo $ECHO_N "checking for lt_dlinterface_register in -lltdl... $ECHO_C" >&6; } ++if test "${ac_cv_lib_ltdl_lt_dlinterface_register+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 + else + ac_check_lib_save_LIBS=$LIBS +@@ -20096,11 +20096,11 @@ + #ifdef __cplusplus + extern "C" + #endif +-char lt_dlcaller_register (); ++char lt_dlinterface_register (); + int + main () + { +-return lt_dlcaller_register (); ++return lt_dlinterface_register (); + ; + return 0; + } +@@ -20123,21 +20123,21 @@ + test ! -s conftest.err + } && test -s conftest$ac_exeext && + $as_test_x conftest$ac_exeext; then +- ac_cv_lib_ltdl_lt_dlcaller_register=yes ++ ac_cv_lib_ltdl_lt_dlinterface_register=yes + else + echo "$as_me: failed program was:" >&5 + sed 's/^/| /' conftest.$ac_ext >&5 + +- ac_cv_lib_ltdl_lt_dlcaller_register=no ++ ac_cv_lib_ltdl_lt_dlinterface_register=no + fi + + rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + conftest$ac_exeext conftest.$ac_ext + LIBS=$ac_check_lib_save_LIBS + fi +-{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlcaller_register" >&5 +-echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlcaller_register" >&6; } +-if test $ac_cv_lib_ltdl_lt_dlcaller_register = yes; then ++{ echo "$as_me:$LINENO: result: $ac_cv_lib_ltdl_lt_dlinterface_register" >&5 ++echo "${ECHO_T}$ac_cv_lib_ltdl_lt_dlinterface_register" >&6; } ++if test $ac_cv_lib_ltdl_lt_dlinterface_register = yes; then + LTDLINCL="" + LIBLTDL="-lltdl" + +diff -urNad libgphoto2-2.4.2~/libgphoto2_port/m4/gp-libltdl.m4 libgphoto2-2.4.2/libgphoto2_port/m4/gp-libltdl.m4 +--- libgphoto2-2.4.2~/libgphoto2_port/m4/gp-libltdl.m4 2008-03-24 12:47:19.000000000 +0100 ++++ libgphoto2-2.4.2/libgphoto2_port/m4/gp-libltdl.m4 2008-07-28 00:56:31.000000000 +0200 +@@ -13,7 +13,7 @@ + if test "x${LTDLINCL}${LIBLTDL}" = "x"; then + AC_CHECK_HEADER([ltdl.h], + [dnl +-AC_CHECK_LIB([ltdl], [lt_dlcaller_register],[dnl ++AC_CHECK_LIB([ltdl], [lt_dlinterface_register],[dnl + LTDLINCL="" + LIBLTDL="-lltdl" + AC_DEFINE([HAVE_LTDL],[1],[Whether libltdl (of libtool fame) is present]) +diff -urNad libgphoto2-2.4.2~/m4m/gp-libltdl.m4 libgphoto2-2.4.2/m4m/gp-libltdl.m4 +--- libgphoto2-2.4.2~/m4m/gp-libltdl.m4 2008-03-24 12:47:12.000000000 +0100 ++++ libgphoto2-2.4.2/m4m/gp-libltdl.m4 2008-07-28 00:58:20.000000000 +0200 +@@ -13,7 +13,7 @@ + if test "x${LTDLINCL}${LIBLTDL}" = "x"; then + AC_CHECK_HEADER([ltdl.h], + [dnl +-AC_CHECK_LIB([ltdl], [lt_dlcaller_register],[dnl ++AC_CHECK_LIB([ltdl], [lt_dlinterface_register],[dnl + LTDLINCL="" + LIBLTDL="-lltdl" + AC_DEFINE([HAVE_LTDL],[1],[Whether libltdl (of libtool fame) is present]) --- libgphoto2-2.4.2.orig/debian/patches/00list +++ libgphoto2-2.4.2/debian/patches/00list @@ -0,0 +1,6 @@ +10_disable_cache +11_hurd_no_path_max_bsdsource +45_increase_canon_timeout.dpatch +60_udev_rules_are_autogenerated_notice +70_increase_max_entries +deprecated_lt_dlcaller_register --- libgphoto2-2.4.2.orig/debian/patches/45_increase_canon_timeout.dpatch +++ libgphoto2-2.4.2/debian/patches/45_increase_canon_timeout.dpatch @@ -0,0 +1,47 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 45_increase_canon_timeout.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Increase timeout wait for an URB to come back on an interrupt endpoint +## +## Reported by Shai Berger as Bug#453114: +## +## Version 2.4.0 of libgphoto2 broke support for several Canon camares, +## it seems, by using a parameter CANON_FAST_TIMEOUT whose value +## seems to be set too low. The result is that libgphoto fails to +## connect to the camera, reporting something like +## +## Error (-114: 'OS error in camera communication') +## +## This is all reported in an upstream bug: +## http://sourceforge.net/tracker/index.php?func=detail&aid=1790633&group_id=8874&atid=108874 +## +## The upstream bug includes a suggestion for a fix -- increase +## the timeout constant. The fix seems to have helped the original +## reporter, and he said so over two months ago; it seems to have +## corrected the problem completely for me. So I'm filing this +## bug, hoping to get the fix tested in debian as long as upstream +## hesitates. +## +## Update (2008-11-05) by Cyril Brulebois : +## Upstream bumped the timeout from 75 to 150, but users reported that +## a single image only would then be downloaded. Keeping the timeout +## to 750 as in the previous version of that patch. +## +## Update (2008-27-06) by Devid Filoni : +## Upstream bumped the timeout from 150 to 175. Keeping the timeout +## to 750 as in the previous version of that patch. +## +@DPATCH@ +diff -urNad libgphoto2-2.4.0~/camlibs/canon/usb.c libgphoto2-2.4.0/camlibs/canon/usb.c +--- libgphoto2-2.4.0~/camlibs/canon/usb.c 2007-07-27 02:35:50.000000000 +0200 ++++ libgphoto2-2.4.0/camlibs/canon/usb.c 2007-11-27 15:11:33.290924579 +0100 +@@ -72,7 +72,7 @@ + + /* CANON_FAST_TIMEOUT: how long (in milliseconds) we should wait for + * an URB to come back on an interrupt endpoint */ +-#define CANON_FAST_TIMEOUT 175 ++#define CANON_FAST_TIMEOUT 750 + + /* WARNING: This destroys reentrancy of the code. Better to put this + * in the camera descriptor somewhere. */ --- libgphoto2-2.4.2.orig/debian/patches/10_disable_cache.dpatch +++ libgphoto2-2.4.2/debian/patches/10_disable_cache.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 10_disable_cache.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Do not cache downloaded files in memory to plug a giant memory hole +## DP: (see Debian bug #372166) + +@DPATCH@ +diff -urNad libgphoto2-2.3.0~/libgphoto2/gphoto2-filesys.c libgphoto2-2.3.0/libgphoto2/gphoto2-filesys.c +--- libgphoto2-2.3.0~/libgphoto2/gphoto2-filesys.c 2006-11-25 15:47:20.000000000 +0100 ++++ libgphoto2-2.3.0/libgphoto2/gphoto2-filesys.c 2007-01-13 15:04:47.733634516 +0100 +@@ -1576,9 +1576,6 @@ + CR (gp_file_set_type (file, type)); + CR (gp_file_set_name (file, filename)); + +- /* Cache this file */ +- CR (gp_filesystem_set_file_noop (fs, folder, file, context)); +- + /* + * Often, thumbnails are of a different mime type than the normal + * picture. In this case, we should rename the file. --- libgphoto2-2.4.2.orig/debian/patches/11_hurd_no_path_max_bsdsource.dpatch +++ libgphoto2-2.4.2/debian/patches/11_hurd_no_path_max_bsdsource.dpatch @@ -0,0 +1,56 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 11_hurd_no_path_max_bsdsource.dpatch by Samuel Thibault +## +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Hurd has no such hard limit like PATH_MAX, and define _BSD_SOURCE +## DP: because code uses IXANY and O_NDELAY. + +@DPATCH@ +diff -urNad libgphoto2-2.4.0~/camlibs/digita/digita.c libgphoto2-2.4.0/camlibs/digita/digita.c +--- libgphoto2-2.4.0~/camlibs/digita/digita.c 2007-07-27 02:35:51.000000000 +0200 ++++ libgphoto2-2.4.0/camlibs/digita/digita.c 2007-08-15 00:08:35.993573985 +0200 +@@ -138,7 +138,6 @@ + /* Walk through all of the pictures building a list of folders */ + for (i = 0; i < camera->pl->num_pictures; i++) { + int found; +- char tmppath[PATH_MAX + 1]; + char *path; + + /* Check to make sure the path matches the folder we're */ +@@ -159,22 +158,19 @@ + if (strchr(path, '/') != path + strlen(path) - 1) + continue; + +- strncpy(tmppath, path, MIN(strlen(path) - 1, PATH_MAX)); +- tmppath[strlen(path) - 1] = 0; +- + found = 0; + for (i1 = 0; i1 < gp_list_count(list); i1++) { + const char *name; + + gp_list_get_name(list, i1, &name); +- if (!strcmp(name, tmppath)) { ++ if (!strcmp(name, path)) { + found = 1; + break; + } + } + + if (!found) +- gp_list_append(list, tmppath, NULL); ++ gp_list_append(list, path, NULL); + } + + return GP_OK; +diff -urNad libgphoto2-2.4.0~/libgphoto2_port/serial/unix.c libgphoto2-2.4.0/libgphoto2_port/serial/unix.c +--- libgphoto2-2.4.0~/libgphoto2_port/serial/unix.c 2007-07-27 02:36:13.000000000 +0200 ++++ libgphoto2-2.4.0/libgphoto2_port/serial/unix.c 2007-08-15 00:08:58.494856260 +0200 +@@ -27,6 +27,7 @@ + * Boston, MA 02111-1307, USA. + */ + ++#define _BSD_SOURCE + #include "config.h" + #include + --- libgphoto2-2.4.2.orig/debian/patches/60_udev_rules_are_autogenerated_notice.dpatch +++ libgphoto2-2.4.2/debian/patches/60_udev_rules_are_autogenerated_notice.dpatch @@ -0,0 +1,19 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 60_udev_rules_are_autogenerated_notice.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Adds a note to udev rules file to explain that file is generated +## DP: automatically and that local changes will thus be lost on upgrades + +@DPATCH@ +diff -urNad libgphoto2-2.4.0~/packaging/generic/print-camera-list.c libgphoto2-2.4.0/packaging/generic/print-camera-list.c +--- libgphoto2-2.4.0~/packaging/generic/print-camera-list.c 2007-07-27 02:35:28.000000000 +0200 ++++ libgphoto2-2.4.0/packaging/generic/print-camera-list.c 2007-09-28 19:38:45.287336587 +0200 +@@ -485,6 +485,7 @@ + printf ("# udev rules file for libgphoto2 devices (for udev %s version)\n", + version_str); + print_version_comment(stdout, "# ", "\n", NULL, "#\n"); ++ printf ("# this file is autogenerated, local changes will be LOST on upgrades\n"); + printf (pdata->begin_string); + } + return 0;