[Pkg-utopia-commits] r208 - packages/hal/trunk/debian/patches

[Sjoerd Simons]

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

Removed:
   packages/hal/trunk/debian/patches/storage-policy-zip.patch
Log:
Merged upstream

Deleted: packages/hal/trunk/debian/patches/storage-policy-zip.patch
===================================================================
--- packages/hal/trunk/debian/patches/storage-policy-zip.patch	2005-05-23 17:33:41 UTC (rev 207)
+++ packages/hal/trunk/debian/patches/storage-policy-zip.patch	2005-05-23 17:33:56 UTC (rev 208)
@@ -1,16 +0,0 @@
-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-02-15 11:45:57.162602000 +0100
-+++ hal-0.4.7/fdi/90defaultpolicy/storage-policy.fdi	2005-02-15 11:51:14.049866897 +0100
-@@ -119,9 +119,9 @@
- 	  <append key="volume.policy.desired_mount_point" type="string">disk</append>
- 
-          <!-- zip drives -->
--         <match key="storage.drive_type" string="zip">
-- 	   <merge key="storage.policy.desired_mount_point" type="string">zip</merge>
--         </match>
-+		<match key="@block.storage_device:storage.drive_type" string="zip">
-+			<merge key="volume.policy.desired_mount_point" type="string">zip</merge>
-+		</match>
- 	  
-           <!-- Best: If available use filesystem label -->
-           <match key="volume.label" empty="false">