hal: Branch 'master'

[Danny Kukawka]

 fdi/information/10freedesktop/10-usb-music-players.fdi |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

New commits:
diff-tree 133eb5ba05effb6e8e9796476769ee61ba39ef56 (from a56f07994061e5f9bb543b0959946eb893994790)
Author: Danny Kukawka <danny.kukawka at web.de>
Date:   Thu Jun 14 00:23:30 2007 +0200

    fix LG Fusic Phone entry
    
    Fix entry for LG Fusic Phone:
    * s/physical_device/originating_device/
    * s/adddset/addset/ as detected by Richard

diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index c34f135..5ff6d3a 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -677,14 +677,14 @@
 	</match>
 
  	<!-- LG Fusic Phone -->
-        <match key="@storage.physical_device:usb.vendor_id" int="0x05c6">
-          <match key="@storage.physical_device:usb.product_id" int="0x1000">
-            <addset key="info.capabilities" type="strlist">portable_audio_player</adddset>
+        <match key="@storage.originating_device:usb.vendor_id" int="0x05c6">
+          <match key="@storage.originating_device:usb.product_id" int="0x1000">
+            <addset key="info.capabilities" type="strlist">portable_audio_player</addset>
             <merge key="info.category" type="string">portable_audio_player</merge>
             <addset key="portable_audio_player.access_method.protocols" type="strlist">storage</addset>
             <addset key="portable_audio_player.output_formats" type="strlist">audio/mpeg</addset>
-            <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</adddset>
-            <addset key="portable_audio_player.audio_folders" type="strlist">MUSIC</adddset>
+            <addset key="portable_audio_player.output_formats" type="strlist">audio/aac</addset>
+            <addset key="portable_audio_player.audio_folders" type="strlist">MUSIC</addset>
             <append key="portable_audio_player.playlist_path" type="string">MUSIC/AllMyMusic.m3u</append>
             <addset key="portable_audio_player.playlist_format" type="strlist">audio/x-mpegurl</addset>
           </match>