diff -u libgphoto2-2.3.0/debian/control libgphoto2-2.3.0/debian/control --- libgphoto2-2.3.0/debian/control +++ libgphoto2-2.3.0/debian/control @@ -1,7 +1,8 @@ Source: libgphoto2 Section: libs Priority: optional -Maintainer: Frederic Peters +Maintainer: ubuntu-devel@lists.ubuntu.com +XSBC-Original-Maintainer: Frederic Peters Build-Depends: debhelper (>> 5.0.0), zlib1g-dev, libtool, libusb-dev (>= 1:0.1.5), libgpmg1-dev, pkg-config, libexif-dev (>= 0.5.9), libjpeg62-dev, libhal-dev (>= 0.5.0-1), doxygen, libdbus-1-dev Build-Conflicts: liblockdev1-dev Standards-Version: 3.7.2 diff -u libgphoto2-2.3.0/debian/changelog libgphoto2-2.3.0/debian/changelog --- libgphoto2-2.3.0/debian/changelog +++ libgphoto2-2.3.0/debian/changelog @@ -1,3 +1,16 @@ +libgphoto2 (2.3.0-0ubuntu2) feisty; urgency=low + + * packaging/generic/print-camera-list.c: Ignore zero vendor IDs, since they + will match on parent devices without a vendor/product ID (since we have to + use ATTRS, not just ATTR). This avoids messing up other device's + permissions. (LP: #76077) + * packaging/generic/check_ptp_camera: Run with bash, since the script has + some bashisms that avoid calling cat several times. This makes the script + work again. (LP: #67532) + * debian/control: Adapt maintainers for Ubuntu. + + -- Martin Pitt Tue, 13 Feb 2007 17:10:02 +0100 + libgphoto2 (2.3.0-0ubuntu1) feisty; urgency=low * New upstream version 2.3.0. Closes: LP#74847, LP#61163 diff -u libgphoto2-2.3.0/packaging/generic/check_ptp_camera libgphoto2-2.3.0/packaging/generic/check_ptp_camera --- libgphoto2-2.3.0/packaging/generic/check_ptp_camera +++ libgphoto2-2.3.0/packaging/generic/check_ptp_camera @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # check if any interface of this device is a PTP camera interface (06) INTERFACE="${1:-06/01/01}" diff -u libgphoto2-2.3.0/packaging/generic/print-camera-list.c libgphoto2-2.3.0/packaging/generic/print-camera-list.c --- libgphoto2-2.3.0/packaging/generic/print-camera-list.c +++ libgphoto2-2.3.0/packaging/generic/print-camera-list.c @@ -471,6 +471,8 @@ else fprintf(stderr,"unhandled interface match flags %x\n", flags); } else { + if (!a->usb_vendor) + return 0; printf ("ATTRS{idVendor}==\"%04x\", ATTRS{idProduct}==\"%04x\", ", a->usb_vendor, a->usb_product); }