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

[Sjoerd Simons]

Author: sjoerd
Date: 2005-02-15 11:53:59 +0100 (Tue, 15 Feb 2005)
New Revision: 185

Added:
   packages/hal/trunk/debian/patches/storage-policy-zip.patch
Modified:
   packages/hal/trunk/debian/changelog
Log:
Added patch to correctly name zip drive mountpoints

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2005-02-15 10:18:40 UTC (rev 184)
+++ packages/hal/trunk/debian/changelog	2005-02-15 10:53:59 UTC (rev 185)
@@ -1,15 +1,18 @@
-hal (0.4.7-2) UNRELEASED; urgency=low
+hal (0.4.7-2) unstable; urgency=low
 
   * debian/patches/storage-policy-debian.patch
-    + Updated. Enable the quiet option for vfat volumes (Closes: #292661)
+    + Updated. Enable the quiet option for vfat volumes. (Closes: #292661)
   * debian/hal.dbus.init
-    + Show a warning message when trying to start with an unsupported kernel
-      (Closes: #292644)
+    + Show a warning message when trying to start with an unsupported kernel.
+     (Closes: #292644)
   * debian/patches/no_sysdevice.path
     + Don't die when a device doesn't have a sysfs path when finalizing the
       class device. (Closes: #293630)
+  * debian/patches/storage-policy-zip.patch
+    + Added. Correctly name partitioned zip mountpoints. Patch from Daniel 
+      Serpell. (Closes: #294033)
 
- -- Sjoerd Simons <sjoerd@debian.org>  Tue, 15 Feb 2005 10:15:29 +0100
+ -- Sjoerd Simons <sjoerd@debian.org>  Tue, 15 Feb 2005 11:51:34 +0100
 
 hal (0.4.7-1) unstable; urgency=medium
 

Added: packages/hal/trunk/debian/patches/storage-policy-zip.patch
===================================================================
--- packages/hal/trunk/debian/patches/storage-policy-zip.patch	2005-02-15 10:18:40 UTC (rev 184)
+++ packages/hal/trunk/debian/patches/storage-policy-zip.patch	2005-02-15 10:53:59 UTC (rev 185)
@@ -0,0 +1,16 @@
+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">