Please package changes in r12140..12143 (iPhone/Touch)

[Paul Sladen]

Please pull/packages the changes in SVN revision 12140..12143:

  http://gphoto.svn.sourceforge.net/viewvc/gphoto?view=rev&revision=12140
  http://gphoto.svn.sourceforge.net/viewvc/gphoto?view=rev&revision=12141
  http://gphoto.svn.sourceforge.net/viewvc/gphoto?view=rev&revision=12142
  http://gphoto.svn.sourceforge.net/viewvc/gphoto?view=rev&revision=12143

as these includes fixes that limit the scope of the FDI doing PTP (camera device) matching against iPhone/iTouch devices. This narrower match allows native protocol access without conflict and stop an error where the devices pop up twice.

[Marcus Meissner (meissner)]

please dont yet, it is not working as intended.

everything is now detected as Apple iPhone with this patches

[Marcus Meissner (meissner)]

better use this patch

[Martin Pitt (pitti)]

Thanks Marcus!

[Martin Pitt (pitti)]

I guess the udev rules need a similar change then?

[Launchpad Janitor (janitor)]

This bug was fixed in the package libgphoto2 - 2.4.6-1ubuntu4

---------------
libgphoto2 (2.4.6-1ubuntu4) karmic; urgency=low

  * debian/rules: Fix name of FDI file.
  * Add debian/patches/02_iphone_fdi: Detect iPhones in hal FDI properly.
    Taken from upstream SVN, thanks Marcus Meissner! (LP: #386002)

 -- Martin Pitt <email address hidden> Sun, 14 Jun 2009 22:25:59 +0200

[Nikias Bassen (nikias)]

Martin, what udev rules are you talking about? The default ubuntu udev rules do not deal with Apple PTP devices. Everything else is implemented with libiphone+usbmuxd which ships with a udev rule on its own.

[Nikias Bassen (nikias)]

Ah, forgot something, will there be a backport for Jaunty?

[Martin Pitt (pitti)]

Nikias Bassen [2009-06-14 21:06 -0000]:
> Martin, what udev rules are you talking about?

print-camera-list doesn't just produce hal FDI files, but also udev
rules (hal is currently being deprecated). However, the patch was
specific to hal FDIs, so I wondered whether the udev rules also need
to be updated.

[Martin Pitt (pitti)]

Nikias Bassen [2009-06-14 21:07 -0000]:
> Ah, forgot something, will there be a backport for Jaunty?

No, this isn't a bug which matches our stable release update criteria.
(See https://wiki.ubuntu.com/StableReleaseUpdates)

[Nikias Bassen (nikias)]

Martin, thanks for the quick answers. I took a look at the udev rules that are produced by print-camera-list, they seem to be used to set the ownership and permissions of the usb device files. AFAIK these udev rules are not used within Jaunty; and in Karmic, not even the fdi rules are generated automatically. So it should be no problem.

[Martin Pitt (pitti)]

Nikias Bassen [2009-06-14 22:13 -0000]:
> Martin, thanks for the quick answers. I took a look at the udev rules
> that are produced by print-camera-list, they seem to be used to set the
> ownership and permissions of the usb device files. AFAIK these udev
> rules are not used within Jaunty; and in Karmic, not even the fdi rules
> are generated automatically. So it should be no problem.

The Karmic package generates both udev rules (in mode 136) and the fdi
during package build now and ships them statically.

Check /lib/udev/rules.d/40-libgphoto2-2.rules. It's not yet used, but
it hopefully will soon.

[Nikias Bassen (nikias)]

Ah well I see. But I just found a problem. The fdi file shipped with the debian file does not contain any matching except info.subsystem "usb". This is because print-camera-list is built with a libtool wrapper script that seems to be used during package building instead of the final binary file. This should not, but indeed does, produce a different output than the final binary file which is located in packaging/generic/.libs/print-camera-list after building. Possibly the udev file is also generated
Besides that, there is another problem. If I use the correct print-camera-list program with the hal-fdi argument, the fdi file is generated BUT the matching for Apple iPhones is still incorrect, using usb.interface.class=0, usb.interface.subclass=0, and usb.interface.protocol=0. Attached is the corrected patch from above using 6:1:1.

@Marcus: You should fix this in libgphoto2 SVN, too.

@Martin: Perhaps you should use
./packaging/generic/.libs/print-camera-list udev-rules [...]
 and
./packaging/generic/.libs/print-camera-list hal-fdi

instead of
./packaging/generic/print-camera-list udev-rules [...]
 and
./packaging/generic/print-camera-list hal-fdi

inside the debian/rules file which worked for me.

[Nikias Bassen (nikias)]

concerning debian/rules: My suggestions "works" but print-camera-list is executed with the installed version of libgphoto2 and not the one that has just been compiled. Perhaps it might be better NOT to ship static files for udev/fdi and put the file creation back into libgphoto2-2.postinst to make sure the files are really created with the latest version of the library.

Attached is a patch that adds iPod Touch 1G and renames the already present iPod Touch entry to iPod Touch 2G, just to be complete. If the iPhone 3G S product_id has been verified, you can add it too (I bet it is 0x1294).

[Martin Pitt (pitti)]

Nikias, thanks for spotting this. Odd, it worked fine in my local build. I'll track this down.

[Launchpad Janitor (janitor)]

This bug was fixed in the package libgphoto2 - 2.4.6-1ubuntu5

---------------
libgphoto2 (2.4.6-1ubuntu5) karmic; urgency=low

  * debian/rules: Set CAMLIBS to local directory when calling
    print-camera-list, so that it also works on the buildds.
  * debian/patches/02_iphone_fdi: Update to use correct interface
    class/protocol, thanks to Nikias Bassen! (LP: #386002)

 -- Martin Pitt <email address hidden> Mon, 15 Jun 2009 09:17:37 +0200