Package: libgphoto2
Severity: important
Version: 2.4.0-8
Tags: patch
User: [EMAIL PROTECTED]
Usertags: origin-ubuntu hardy ubuntu-patch

With hal 0.5.11RC2, the hal property "info.bus" has been deprecated,
and thus the generated gphoto FDI rules do not work any more. Attached
debdiff fixes this to use "info.subsystem".

Thanks,

Martin
-- 
Martin Pitt                        | http://www.piware.de
Ubuntu Developer (www.ubuntu.com)  | Debian Developer  (www.debian.org)
diff -u libgphoto2-2.4.0/debian/patches/00list 
libgphoto2-2.4.0/debian/patches/00list
--- libgphoto2-2.4.0/debian/patches/00list
+++ libgphoto2-2.4.0/debian/patches/00list
@@ -13,0 +14 @@
+72_deprecated_hal_key
diff -u libgphoto2-2.4.0/debian/changelog libgphoto2-2.4.0/debian/changelog
--- libgphoto2-2.4.0/debian/changelog
+++ libgphoto2-2.4.0/debian/changelog
@@ -1,3 +1,12 @@
+libgphoto2 (2.4.0-8ubuntu6) hardy; urgency=low
+
+  * Add debian/patches/72_deprecated_hal_key.dpatch: Replace the deprecated
+    hal property "info.bus" with "info.subsystem" in the hal FDI generation
+    tool. This fixes cameras to work with current hal without using deprecated
+    keys. (LP: #205417)
+
+ -- Martin Pitt <[EMAIL PROTECTED]>  Tue, 25 Mar 2008 16:32:03 +0100
+
 libgphoto2 (2.4.0-8ubuntu5) hardy; urgency=low
 
   * debian/control:
only in patch2:
unchanged:
--- libgphoto2-2.4.0.orig/debian/patches/72_deprecated_hal_key.dpatch
+++ libgphoto2-2.4.0/debian/patches/72_deprecated_hal_key.dpatch
@@ -0,0 +1,30 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 72_deprecated_hal_key.dpatch by  <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: info.bus hal property is deprecated with 0.5.11, use info.subsystem;
+## DP: 
http://gphoto.svn.sourceforge.net/viewvc/gphoto/trunk/libgphoto2/packaging/generic/print-camera-list.c?r1=10735&r2=10967
+## DP: https://bugs.launchpad.net/205417
+
[EMAIL PROTECTED]@
+diff -urNad libgphoto2-2.4.0~/packaging/generic/print-camera-list.c 
libgphoto2-2.4.0/packaging/generic/print-camera-list.c
+--- libgphoto2-2.4.0~/packaging/generic/print-camera-list.c    2007-07-27 
02:35:28.000000000 +0200
++++ libgphoto2-2.4.0/packaging/generic/print-camera-list.c     2008-03-25 
16:29:31.000000000 +0100
+@@ -798,7 +798,7 @@
+       print_version_comment(stdout, "    | ", "\n", "<!--+\n", "    +-->\n");
+       printf("<deviceinfo version=\"0.2\">\n");
+       printf(" <device>\n");
+-      printf("  <match key=\"info.bus\" string=\"usb\">\n");
++      printf("  <match key=\"info.subsystem\" string=\"usb\">\n");
+       return 0;
+ }
+ 
+@@ -917,7 +917,7 @@
+       print_version_comment(stdout, "    | ", "\n", "<!--+\n", "    +-->\n");
+       printf("<deviceinfo version=\"0.2\">\n");
+       printf(" <device>\n");
+-      printf("  <match key=\"info.bus\" string=\"usb\">\n");
++      printf("  <match key=\"info.subsystem\" string=\"usb\">\n");
+       return 0;
+ }
+ 

Attachment: signature.asc
Description: Digital signature

Reply via email to