[Pkg-utopia-commits] r209 - in packages/hal/trunk/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2005-05-23 17:49:33 +0000 (Mon, 23 May 2005)
New Revision: 209

Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/hal.udev.device-removable.sh
   packages/hal/trunk/debian/patches/storage-policy-debian.patch
Log:
updated changelog

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2005-05-23 17:33:56 UTC (rev 208)
+++ packages/hal/trunk/debian/changelog	2005-05-23 17:49:33 UTC (rev 209)
@@ -1,8 +1,16 @@
 hal (0.4.8-1) unstable; urgency=low
 
-  * New upstream release 
+  * New upstream release
+  * debian/patches/storage-policy-zip.patch
+    + Removed. Merged upstream
+  * debian/patches/ids-search.patch
+    + Updated
+  * debian/patches/hotplug_timeout.patch
+    + Updated to work with dbs-edit-patch
+  * debian/hal.udev.device-removable.sh
+    + Fixed problem with detection of firewire disks (Closes: #309822)
 
- -- Sjoerd Simons <sjoerd@debian.org>  Mon, 23 May 2005 19:22:17 +0200
+ -- Sjoerd Simons <sjoerd@debian.org>  Mon, 23 May 2005 19:33:59 +0200
 
 hal (0.4.7-4) unstable; urgency=low
 

Modified: packages/hal/trunk/debian/hal.udev.device-removable.sh
===================================================================
--- packages/hal/trunk/debian/hal.udev.device-removable.sh	2005-05-23 17:33:56 UTC (rev 208)
+++ packages/hal/trunk/debian/hal.udev.device-removable.sh	2005-05-23 17:49:33 UTC (rev 209)
@@ -35,7 +35,7 @@
 
 if [ "$IS_REMOVABLE" != 1 -a "$SCAN_BUS" ]; then
   DEVICE="$(readlink -f "${BLOCKPATH}/device")"
-  for bus in "$SCAN_BUS"; do
+  for bus in $SCAN_BUS; do
     if on_bus $DEVICE $bus; then
       IS_REMOVABLE=1
       break

Modified: packages/hal/trunk/debian/patches/storage-policy-debian.patch
===================================================================
--- packages/hal/trunk/debian/patches/storage-policy-debian.patch	2005-05-23 17:33:56 UTC (rev 208)
+++ packages/hal/trunk/debian/patches/storage-policy-debian.patch	2005-05-23 17:49:33 UTC (rev 209)
@@ -1,6 +1,6 @@
-diff -ruN hal-0.4.7-old/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi
---- hal-0.4.7-old/fdi/90defaultpolicy/storage-policy.fdi	2005-01-20 18:03:57.000000000 +0100
-+++ hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi	2005-02-08 16:23:06.443290291 +0100
+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
 @@ -6,11 +6,11 @@
    <device>
      <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
@@ -17,7 +17,7 @@
        <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
      </match>
    </device>
-@@ -105,6 +105,9 @@
+@@ -116,6 +116,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,9 +27,21 @@
  	<match key="@block.storage_device:storage.no_partitions_hint" bool="false">
  
  	  <merge key="volume.policy.should_mount" type="bool">true</merge>
-@@ -164,11 +167,22 @@
+@@ -164,6 +167,9 @@
+ 
+ 	  <!-- Use noatime and sync options for all hotpluggable or removable
+ 	       volumes smaller than 2GB -->
++
++	 <!-- Mounting with sync wears out flash disk too much, thus disable it by
++	      default
+ 	  <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 @@
+ 	      <merge key="volume.policy.mount_option.noatime" type="bool">true</merge>
  	    </match>
  	  </match>
++	  -->
  
 -	  <!-- Use UTF-8 charset for vfat -->
 +	  <!-- Use UTF-8 charset and the quiet option for vfat -->