Bug#531979: libgphoto2: Please create hal fdi at build time

[Martin Pitt]

Hello again,

Martin Pitt [2009-06-05 15:04 +0200]:
> Attached debdiff moves fdi creation into debian/rules to do it at
> build time.

Sorry, the initial patch failed to set CAMLIBS, which caused the
package to use the installed camera libs. Fixed patch attached.

Martin
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)

 * Move hal fdi creation from debian/libgphoto2-2.postinst to debian/rules.
   This avoids problems with half-configured libraries during
   upgrade/installation (LP: #352271), and is generally more robust as well.
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
--- libgphoto2-2.4.6/debian/libgphoto2-2.postrm
+++ libgphoto2-2.4.6/debian/libgphoto2-2.postrm
@@ -10,7 +10,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/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,11 +7,6 @@
 
 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

signature.asc
Description: Digital signature