hal: Branch 'origin' - 2 commits
David Zeuthen
david at kemper.freedesktop.org
Fri Apr 6 14:19:47 PDT 2007
configure.in | 2 +-
fdi/information/10freedesktop/10-usb-music-players.fdi | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
New commits:
diff-tree f7ed323781b2268e8f3f32881358cec841ddb414 (from 99a23a544de6a3fec811a81f7ddcd81265994db1)
Author: Danny Kukawka <danny.kukawka at web.de>
Date: Fri Apr 6 19:18:19 2007 +0200
extend support for Motorola Phones with iTunes support
Extended support for Motorola Phones with iTunes capabilities. Added
match for lowercase (contains_ncase) 'itunes' in the device string.
diff --git a/fdi/information/10freedesktop/10-usb-music-players.fdi b/fdi/information/10freedesktop/10-usb-music-players.fdi
index caf66ca..1daf02f 100644
--- a/fdi/information/10freedesktop/10-usb-music-players.fdi
+++ b/fdi/information/10freedesktop/10-usb-music-players.fdi
@@ -5,8 +5,8 @@
<!-- some specual device handling -->
<match key="info.subsystem" string="usb">
- <!-- copy information to identify the v3i Motorola -->
- <match key="@info.parent:usb_device.product" contains="Motorola Phone (V3i)">
+ <!-- copy information to identify the Motorola Phones -->
+ <match key="@info.parent:usb_device.product" contains="Motorola Phone">
<match key="usb.product" string="USB Mass Storage Interface">
<merge key="info.product" type="copy_property">@info.parent:usb_device.product</merge>
<prepend key="info.product" type="string">USB Mass Storage Interface at </prepend>
@@ -674,6 +674,10 @@
<merge key="storage.model" type="string">Motorola Phone (V3i)</merge>
<merge key="portable_audio_player.type" type="string">ipod</merge>
</match>
+ <match key="@storage.physical_device:info.product" contains_ncase="iTunes">
+ <merge key="storage.model" type="string">Motorola iTunes Phone</merge>
+ <merge key="portable_audio_player.type" type="string">ipod</merge>
+ </match>
<merge key="storage.vendor" type="string">Motorola</merge>
<merge key="portable_audio_player.access_method" type="string">storage</merge>
<append key="portable_audio_player.output_formats" type="strlist">audio/aac</append>
diff-tree 99a23a544de6a3fec811a81f7ddcd81265994db1 (from f3a06388f3c0a0ebbd609fd2700d1a583ac5a216)
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Apr 2 23:59:08 2007 -0400
update version to 20070402
diff --git a/configure.in b/configure.in
index 6d316fb..f444fdb 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
AC_PREREQ(2.57)
-AC_INIT(hal-info, 20070328, david at fubar.dk)
+AC_INIT(hal-info, 20070402, david at fubar.dk)
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
AM_CONFIG_HEADER(config.h)
More information about the hal-commit
mailing list