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.000000000 +0200
+++ libgphoto2-2.5.4/debian/changelog 2014-11-04 09:15:05.000000000 +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.000000000 +0200
+++ libgphoto2-2.5.4/debian/rules 2014-11-04 09:14:28.000000000 +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
