[Pkg-utopia-commits] r221 - in packages/unstable/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-06-13 15:24:02 +0000 (Mon, 13 Jun 2005)
New Revision: 221

Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/ipod-music-player.fdi
   packages/unstable/hal/debian/patches/storage-policy-debian.patch
Log:
* debian/ipod-music-player.fdi 
  + Fix xml errors (Closes: #312817)
* debian/patches/storage-policy-debian.patch
  + Enable the utf8 mount option for cdrom drives and iso9660 and udf
    filesystems. (Closes: #312818)



Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2005-06-10 17:20:56 UTC (rev 220)
+++ packages/unstable/hal/debian/changelog	2005-06-13 15:24:02 UTC (rev 221)
@@ -1,3 +1,13 @@
+hal (0.4.8-2) unstable; urgency=low
+
+  * debian/ipod-music-player.fdi 
+    + Fix xml errors (Closes: #312817)
+  * debian/patches/storage-policy-debian.patch
+    + Enable the utf8 mount option for cdrom drives and iso9660 and udf
+      filesystems. (Closes: #312818)
+
+ -- Sjoerd Simons <sjoerd@debian.org>  Fri, 10 Jun 2005 15:50:45 +0200
+
 hal (0.4.8-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/unstable/hal/debian/ipod-music-player.fdi
===================================================================
--- packages/unstable/hal/debian/ipod-music-player.fdi	2005-06-10 17:20:56 UTC (rev 220)
+++ packages/unstable/hal/debian/ipod-music-player.fdi	2005-06-13 15:24:02 UTC (rev 221)
@@ -6,12 +6,12 @@
     <!-- Apple iPod - TODO: use USB ids to determine exact output formats  -->
     <match key="info.category" string="storage">
       <match key="storage.vendor" contains="Apple">
-        <match key="storage.model" contains="iPod">
-          <merge key="info.capabilities" type="string">portable_audio_player</append>
+        <match key="storage.model" contains="iPod"> <append key="info.capabilities"
+          type="string">portable_audio_player</append>
           <merge key="portable_audio_player.access_method" type="string">storage</merge>
           <merge key="portable_audio_player.type" type="string">ipod</merge>
           <merge key="portable_audio_player.storage_device" type="copy_property">info.udi</merge>
-          <merge key="portable_audio_player.output_formats" type="string">audio/mpeg audio/x-mp3 audio/aac</append>
+          <append key="portable_audio_player.output_formats" type="string">audio/mpeg audio/x-mp3 audio/aac</append>
           <merge key="storage.requires_eject" type="bool">true</merge>
         </match>
       </match>

Modified: packages/unstable/hal/debian/patches/storage-policy-debian.patch
===================================================================
--- packages/unstable/hal/debian/patches/storage-policy-debian.patch	2005-06-10 17:20:56 UTC (rev 220)
+++ packages/unstable/hal/debian/patches/storage-policy-debian.patch	2005-06-13 15:24:02 UTC (rev 221)
@@ -1,6 +1,6 @@
 diff -ruN hal-0.4.8-old/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.8/fdi/90defaultpolicy/storage-policy.fdi
---- hal-0.4.8-old/fdi/90defaultpolicy/storage-policy.fdi	2005-05-23 19:40:46.000000000 +0200
-+++ hal-0.4.8/fdi/90defaultpolicy/storage-policy.fdi	2005-05-23 19:41:31.000000000 +0200
+--- hal-0.4.8-old/fdi/90defaultpolicy/storage-policy.fdi	2005-06-10 15:36:22.000000000 +0200
++++ hal-0.4.8/fdi/90defaultpolicy/storage-policy.fdi	2005-06-10 15:47:58.000000000 +0200
 @@ -6,11 +6,11 @@
    <device>
      <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
@@ -17,7 +17,15 @@
        <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
      </match>
    </device>
-@@ -116,6 +116,9 @@
+@@ -56,6 +56,7 @@
+     <match key="storage.no_partitions_hint" bool="true">
+       <!-- optical drives -->
+       <match key="storage.drive_type" string="cdrom">
++	<merge key="storage.policy.mount_option.utf8" type="bool">true</merge>
+ 	<merge key="storage.policy.mount_filesystem" type="string">auto</merge>
+ 	<merge key="storage.policy.desired_mount_point" type="string">cdrom</merge>
+ 	<match key="storage.cdrom.cdr" bool="true">
+@@ -116,6 +117,9 @@
      <match key="block.is_volume" bool="true">
        <match key="volume.fsusage" string="filesystem">
  	<!-- skip for drives with the no partitions hint (they are handled above) -->
@@ -27,7 +35,7 @@
  	<match key="@block.storage_device:storage.no_partitions_hint" bool="false">
  
  	  <merge key="volume.policy.should_mount" type="bool">true</merge>
-@@ -164,6 +167,9 @@
+@@ -164,6 +168,9 @@
  
  	  <!-- Use noatime and sync options for all hotpluggable or removable
  	       volumes smaller than 2GB -->
@@ -37,7 +45,7 @@
  	  <match key="volume.size" compare_lt="2147483648">
  	    <match key="@block.storage_device:storage.hotpluggable" bool="true">
  	      <merge key="volume.policy.mount_option.sync" type="bool">true</merge>
-@@ -174,12 +180,24 @@
+@@ -174,12 +181,30 @@
  	      <merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
  	    </match>
  	  </match>
@@ -50,6 +58,12 @@
 +	    <merge key="volume.policy.mount_option.quiet" type="bool">true</merge>
  	  </match>
 -	  
++	  <match key="volume.fstype" string="iso9660">
++	    <merge key="volume.policy.mount_option.utf8" type="bool">true</merge>
++	  </match>
++	  <match key="volume.fstype" string="udf">
++	    <merge key="volume.policy.mount_option.utf8" type="bool">true</merge>
++	  </match>
 +
 +    <match key="volume.size" compare_ge="2147483648">
 +      <match key="@block.storage_device:storage.hotpluggable" bool="true">