Hello, On Wed, 10 Nov 2010 09:07:38 +0100, David Paleino wrote: > [..] > Will reping as soon as it lands in sid. Maybe it's better if I attach the debdiff for review before uploading :-) I'm attaching 2.4.6-2 → 2.4.6-3. If it is ok, I'll upload it to sid. For conffile removal, I couldn't use dpkg-maintscript-helper -- until 2.4.6-1, they were created at postinst-time (thus they weren't marked as conffiles), and in 2.4.6-2 the rules file was already in /lib/. So I just rm them in postinst and postrm (just to be sure). Any better idea? Other than that, I also merged the patch from #531979 by Martin Pitt. Kindly, David -- . ''`. Debian developer | http://wiki.debian.org/DavidPaleino : :' : Linuxer #334216 --|-- http://www.hanskalabs.net/ `. `'` GPG: 1392B174 ----|---- http://deb.li/dapal `- 2BAB C625 4E66 E7B8 450A C3E1 E6AA 9017 1392 B174
diff -u libgphoto2-2.4.6/debian/rules libgphoto2-2.4.6/debian/rules
--- libgphoto2-2.4.6/debian/rules
+++ libgphoto2-2.4.6/debian/rules
@@ -97,6 +97,11 @@
mkdir -p debian/libgphoto2-port0/lib/udev && \
mv debian/tmp/usr/lib/udev/check-mtp-device \
debian/libgphoto2-port0/lib/udev/check-mtp-device
+
+ # create hal FDI
+ mkdir -p debian/libgphoto2-$(major)/usr/share/hal/fdi/preprobe/10osvendor/
+ CAMLIBS=`ls -d debian/libgphoto2-$(major)/usr/lib/libgphoto2/2*` ./packaging/generic/print-camera-list hal-fdi > \
+ debian/libgphoto2-$(major)/usr/share/hal/fdi/preprobe/10osvendor/20-libgphoto2.fdi
endif
# remove *.la files before trying to remove debian/tmp
diff -u libgphoto2-2.4.6/debian/libgphoto2-2.postinst libgphoto2-2.4.6/debian/libgphoto2-2.postinst
--- libgphoto2-2.4.6/debian/libgphoto2-2.postinst
+++ libgphoto2-2.4.6/debian/libgphoto2-2.postinst
@@ -7,15 +7,18 @@
case "$1" in
configure)
- # create FDI file
- mkdir -p /usr/share/hal/fdi/preprobe/10osvendor/ || true
- /usr/lib/$PACKAGE/print-camera-list hal-fdi > \
- /usr/share/hal/fdi/preprobe/10osvendor/20-$PACKAGE.fdi
-
# remove old fdi files
rm -f /usr/share/hal/fdi/information/10freedesktop/10-camera-$PACKAGE.fdi
rm -f /usr/share/hal/fdi/information/20thirdparty/$PACKAGE.fdi
rm -f /usr/share/hal/fdi/information/10freedesktop/10-camera-$PACKAGE-device.fdi
+
+ # remove old config files
+ rm -f /etc/udev/$PACKAGE.rules
+ rm -f /etc/udev/rules.d/025_libgphoto2.rules
+ rm -f /etc/hotplug/usb/$PACKAGE.usermap
+ rm -f /etc/udev/libgphoto2_generic-ptp_support.rules
+ rm -f /etc/udev/rules.d/025_$PACKAGE.rules
+ rm -f /etc/udev/rules.d/020_libgphoto2_generic-ptp_support.rules
;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -u libgphoto2-2.4.6/debian/libgphoto2-2.postrm libgphoto2-2.4.6/debian/libgphoto2-2.postrm
--- libgphoto2-2.4.6/debian/libgphoto2-2.postrm
+++ libgphoto2-2.4.6/debian/libgphoto2-2.postrm
@@ -14,7 +14,6 @@
rm -f /usr/share/hal/fdi/information/20thirdparty/$PACKAGE.fdi || /bin/true
rm -f /usr/share/hal/fdi/information/10freedesktop/10-camera-$PACKAGE.fdi || /bin/true
rm -f /usr/share/hal/fdi/information/10freedesktop/10-camera-$PACKAGE-device.fdi || /bin/true
- rm -f /usr/share/hal/fdi/preprobe/10osvendor/20-$PACKAGE.fdi || /bin/true
;;
disappear|upgrade|failed-upgrade|abort-install|abort-upgrade)
diff -u libgphoto2-2.4.6/debian/changelog libgphoto2-2.4.6/debian/changelog
--- libgphoto2-2.4.6/debian/changelog
+++ libgphoto2-2.4.6/debian/changelog
@@ -1,3 +1,17 @@
+libgphoto2 (2.4.6-3) unstable; urgency=low
+
+ * Merge one more patch by Martin Pitt (thanks!): move HAL FDI
+ creation from debian/libgphoto2-2.postinst to debian/rules.
+ This avoids problems with half-configured libraries during
+ upgrade/installation (LP: #352271, Closes: #531979)
+ * Remove old conffiles. We can't use dpkg-maintscript-helper,
+ because they were created at install-time and thus not marked
+ as conffiles. (Closes: #461397, #511129)
+ * Move from /etc/udev/rules.d/ to /lib/udev/rules.d should now
+ be complete (Closes: #586668)
+
+ -- David Paleino <dapal@debian.org> Wed, 10 Nov 2010 10:26:49 +0100
+
libgphoto2 (2.4.6-2) unstable; urgency=low
* Merge Ubuntu patches, by Martin Pitt (thanks!):
Attachment:
signature.asc
Description: PGP signature