Bug#738522: Drop udev rules (redundant with hwdb file) -- better patch
Hello again, Martin Pitt [2014-11-04 9:48 +0100]: Turns out we shouldn't drop it completely, as the hwdb rules don't cover the generic MTP protocol (or rather, they match on the wrong device). But the USB rules are definitively redundant. So I propose this simpler debdiff which just filters them out. We have run essentially this in Ubuntu for two releases now. The current upstream version fixes this in a more elegant way now, without any need for seddery. You just need to update the udev rule building to version 201 instead of 175, and it's all good now. Trivial debdiff attached for the record. (This is also in Ubuntu now). Thanks for considering, Martin -- Martin Pitt| http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) - debian/rules: Generate udev rules for version 201 to avoid most rules which are already covered by hwdb. (Closes: #738522) --- libgphoto2-2.5.7/debian/rules 2015-03-12 20:14:06.0 +0100 +++ libgphoto2-2.5.7/debian/rules 2015-05-21 11:36:43.0 +0200 @@ -47,7 +47,7 @@ # No longer needed with current udev. But check with non-Linux architectures stuff: # rm debian/libgphoto2-2/lib/udev/check-ptp-camera # Generate the udev file, get it installed, and clean: - CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list udev-rules version 175 mode 0664 group plugdev debian/libgphoto2-$(major).udev + CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list udev-rules version 201 mode 0664 group plugdev debian/libgphoto2-$(major).udev mkdir -p debian/libgphoto2-$(major)/lib/udev/hwdb.d/ CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list hwdb debian/libgphoto2-$(major)/lib/udev/hwdb.d/20-libgphoto2-$(major).hwdb dh_installudev signature.asc Description: Digital signature
Bug#738522: [Pkg-phototools-devel] Bug#738522: Drop udev rules (redundant with hwdb file) -- better patch
Hi Martin, On Thu, 21 May 2015 11:53:02 +0200 Martin Pitt martin.p...@ubuntu.com wrote: Hello again, Martin Pitt [2014-11-04 9:48 +0100]: Turns out we shouldn't drop it completely, as the hwdb rules don't cover the generic MTP protocol (or rather, they match on the wrong device). But the USB rules are definitively redundant. So I propose this simpler debdiff which just filters them out. We have run essentially this in Ubuntu for two releases now. The current upstream version fixes this in a more elegant way now, without any need for seddery. You just need to update the udev rule building to version 201 instead of 175, and it's all good now. Trivial debdiff attached for the record. (This is also in Ubuntu now). Thanks for considering, I will put it in the next version/revision. Thanks for your time. regards, -- Herbert Parentes Fortes Neto (hpfn) -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of unsubscribe. Trouble? Contact listmas...@lists.debian.org
Bug#738522: Drop udev rules (redundant with hwdb file)
Martin Pitt [2014-02-10 8:38 +0100]: The latest libgphoto is now installing a hwdb file for identifying/tagging cameras. That does the same work as the previous /lib/udev/rules.d/40-libgphoto2-6.rules, just much more efficiently. Thus the udev rules file is now redundant and just a waste of time. Can you please drop it? Turns out we shouldn't drop it completely, as the hwdb rules don't cover the generic MTP protocol (or rather, they match on the wrong device). But the USB rules are definitively redundant. So I propose this simpler debdiff which just filters them out. We have run essentially this in Ubuntu for two releases now. Martin -- Martin Pitt| http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) diff -Nru libgphoto2-2.5.4/debian/changelog libgphoto2-2.5.4/debian/changelog --- libgphoto2-2.5.4/debian/changelog 2014-08-25 22:39:15.0 +0200 +++ libgphoto2-2.5.4/debian/changelog 2014-11-04 09:15:05.0 +0100 @@ -1,3 +1,11 @@ +libgphoto2 (2.5.4-1.1ubuntu1) vivid; urgency=medium + + * Merge with Debian unstable. Remaining Ubuntu changes: +- debian/rules: Drop usb udev rules, they are redundant with the hwdb + file. (Debian #738522) + + -- Martin Pitt martin.p...@ubuntu.com Tue, 04 Nov 2014 09:14:31 +0100 + libgphoto2 (2.5.4-1.1) unstable; urgency=low * Non-maintainer upload. diff -Nru libgphoto2-2.5.4/debian/rules libgphoto2-2.5.4/debian/rules --- libgphoto2-2.5.4/debian/rules 2014-08-25 21:47:22.0 +0200 +++ libgphoto2-2.5.4/debian/rules 2014-11-04 09:14:28.0 +0100 @@ -39,8 +39,9 @@ override_dh_installudev: # No longer needed with current udev. But check with non-Linux architectures stuff: # rm debian/libgphoto2-2/lib/udev/check-ptp-camera - # Generate the udev file, get it installed, and clean: - CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list udev-rules version 175 mode 0664 group plugdev debian/libgphoto2-$(major).udev + # Generate the udev file, get it installed, and clean; but ignore the + # USB matches, they are redundant with libgphoto2-6.hwdb + CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list udev-rules version 175 mode 0664 group plugdev | grep -v ^ATTRS debian/libgphoto2-$(major).udev mkdir -p debian/libgphoto2-$(major)/lib/udev/hwdb.d/ CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list hwdb debian/libgphoto2-$(major)/lib/udev/hwdb.d/20-libgphoto2-$(major).hwdb dh_installudev signature.asc Description: Digital signature
Bug#738522: Drop udev rules (redundant with hwdb file)
Package: libgphoto2-6 Version: 2.5.3.1-1 Tags: patch User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu ubuntu-patch trusty Hello, The latest libgphoto is now installing a hwdb file for identifying/tagging cameras. That does the same work as the previous /lib/udev/rules.d/40-libgphoto2-6.rules, just much more efficiently. Thus the udev rules file is now redundant and just a waste of time. Can you please drop it? Attaching the patch that I uploaded to Ubuntu for reference, but it's quite straightforward. Thanks for considering, Martin -- Martin Pitt| http://www.piware.de Ubuntu Developer (www.ubuntu.com) | Debian Developer (www.debian.org) * debian/rules: Stop installing the udev rules; it's redundant with the (much more efficient) hwdb file. diff -Nru libgphoto2-2.5.3.1/debian/rules libgphoto2-2.5.3.1/debian/rules --- libgphoto2-2.5.3.1/debian/rules 2014-02-09 23:39:31.0 +0100 +++ libgphoto2-2.5.3.1/debian/rules 2014-02-10 08:30:06.0 +0100 @@ -39,12 +39,9 @@ override_dh_installudev: # No longer needed with current udev. But check with non-Linux architectures stuff: # rm debian/libgphoto2-2/lib/udev/check-ptp-camera - # Generate the udev file, get it installed, and clean: - CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list udev-rules version 175 mode 0664 group plugdev debian/libgphoto2-$(major).udev + # Generate the hwdb file mkdir -p debian/libgphoto2-$(major)/lib/udev/hwdb.d/ CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/$(DEB_HOST_MULTIARCH)/libgphoto2/2*` ./packaging/generic/print-camera-list hwdb debian/libgphoto2-$(major)/lib/udev/hwdb.d/20-libgphoto2-$(major).hwdb - dh_installudev - rm debian/libgphoto2-$(major).udev endif override_dh_fixperms: signature.asc Description: Digital signature