Hello community, here is the log from the commit of package libmtp for openSUSE:Factory checked in at Wed Feb 2 01:42:20 CET 2011. -------- --- libmtp/libmtp.changes 2011-01-10 10:29:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/libmtp/libmtp.changes 2011-01-25 16:08:33.000000000 +0100 @@ -1,0 +2,5 @@ +Tue Jan 25 16:08:21 CET 2011 - meissner@suse.de + +- do not greedily match all PTP cameras in the udev rules. + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- 0001-do-not-match-PTP-generic-interface.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libmtp.spec ++++++ --- /var/tmp/diff_new_pack.ByyBk8/_old 2011-02-02 01:42:02.000000000 +0100 +++ /var/tmp/diff_new_pack.ByyBk8/_new 2011-02-02 01:42:02.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package libmtp (Version 1.0.4) +# spec file for package libmtp # # Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -27,8 +27,9 @@ AutoReqProv: on Summary: Commandline utilities for access to MTP Players Version: 1.0.4 -Release: 1 +Release: 2 Source0: %name-%version.tar.bz2 +Patch0: 0001-do-not-match-PTP-generic-interface.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -120,6 +121,7 @@ %prep %setup -q +%patch0 -p1 %build %configure --disable-static ++++++ 0001-do-not-match-PTP-generic-interface.patch ++++++
From 9e516b92147fe6abbfe8c8eca593fb98e542e297 Mon Sep 17 00:00:00 2001 From: Marcus Meissner
Date: Tue, 25 Jan 2011 16:05:02 +0100 Subject: [PATCH] do not match PTP generic interface
--- src/libusb-glue.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/src/libusb-glue.c b/src/libusb-glue.c index ea22384..e7fee3d 100644 --- a/src/libusb-glue.c +++ b/src/libusb-glue.c @@ -269,6 +269,8 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile) struct usb_interface_descriptor *intf = &dev->config[i].interface[j].altsetting[k]; +#if 0 + /* This detects _all_ PTP cameras and marks them as MTP devices. Not good. -Marcus */ /* * Check for Still Image Capture class with PIMA 15740 protocol, * also known as PTP @@ -284,6 +286,7 @@ static int probe_device_descriptor(struct usb_device *dev, FILE *dumpfile) usb_close(devh); return 1; } +#endif buf[0] = '\0'; ret = usb_get_string_simple(devh, dev->config[i].interface[j].altsetting[k].iInterface, -- 1.7.3.4 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org