diff options
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | fdi/30-ifuse.fdi | 46 | ||||
| -rw-r--r-- | fdi/Makefile.am | 4 |
4 files changed, 2 insertions, 52 deletions
diff --git a/Makefile.am b/Makefile.am index 70e1c93..e015eec 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,5 +1,5 @@ AUTOMAKE_OPTIONS = foreign -SUBDIRS = src fdi +SUBDIRS = src DISTCHECK_CONFIGURE_FLAGS = --disable-root-sbin diff --git a/configure.ac b/configure.ac index 3d013be..116a17e 100644 --- a/configure.ac +++ b/configure.ac @@ -40,4 +40,4 @@ AC_ARG_ENABLE([root-sbin], [without_root_sbin=yes],[without_root_sbin=no]) AM_CONDITIONAL([WITHOUT_ROOT_SBIN], test "x$without_root_sbin" = "xyes") -AC_OUTPUT(Makefile src/Makefile fdi/Makefile) +AC_OUTPUT(Makefile src/Makefile) diff --git a/fdi/30-ifuse.fdi b/fdi/30-ifuse.fdi deleted file mode 100644 index 5a47d15..0000000 --- a/fdi/30-ifuse.fdi +++ /dev/null @@ -1,46 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<deviceinfo version="0.2"> - <device> - <match key="info.subsystem" string="usb_device"> - <match key="usb_device.vendor_id" int="0x5ac"> - <match key="usb_device.product_id" compare_ge="0x1290"> - <match key="usb_device.product_id" compare_le="0x1294"> - <append key="info.capabilities" type="strlist">block</append> - <append key="info.capabilities" type="strlist">storage</append> - <merge key="storage.hotpluggable" type="bool">false</merge> - <merge key="storage.removable" type="bool">true</merge> - <merge key="storage.requires_eject" type="bool">false</merge> - <merge key="storage.automount_enabled_hint" type="bool">true</merge> - <!-- This also applies to the iPhone as it has the same filesystem structure --> - <merge key="storage.model" type="string">iPod</merge> - <merge key="storage.vendor" type="copy_property">usb_device.vendor</merge> - <merge key="storage.serial" type="copy_property">usb_device.serial</merge> - <merge key="storage.orginating_device" type="copy_property">/org/freedesktop/Hal/devices/computer</merge> - <append key="block.device" type="copy_property">linux.device_file</append> - <merge key="block.storage_device" type="copy_property">info.udi</merge> - </match> - </match> - </match> - </match> - <match key="info.subsystem" string="usb"> - <match key="usb.vendor_id" int="0x5ac"> - <match key="usb.product_id" compare_ge="0x1290"> - <match key="usb.product_id" compare_le="0x1294"> - <match key="usb.interface.number" int="0x1"> - <append key="info.capabilities" type="strlist">block</append> - <append key="info.capabilities" type="strlist">volume</append> - <merge key="info.category" type="string">volume</merge> - <append key="block.device" type="copy_property">@info.parent:linux.device_file</append> - <merge key="block.storage_device" type="copy_property">@info.parent:info.udi</merge> - <merge key="volume.mount.valid_options" type="strlist">allow_other</merge> - <append key="volume.fstype" type="string">fuse.ifuse</append> - <append key="volume.fsusage" type="string">filesystem</append> - <append key="volume.label" type="copy_property">@info.parent:usb_device.product</append> - <append key="volume.uuid" type="copy_property">@info.parent:usb_device.serial</append> - </match> - </match> - </match> - </match> - </match> - </device> -</deviceinfo> diff --git a/fdi/Makefile.am b/fdi/Makefile.am deleted file mode 100644 index adfa88c..0000000 --- a/fdi/Makefile.am +++ /dev/null @@ -1,4 +0,0 @@ -freedesktopfdidir=$(prefix)/share/hal/fdi/information/20thirdparty -freedesktopfdi_DATA=30-ifuse.fdi - -EXTRA_DIST=$(freedesktopfdi_DATA) |