[Pkg-utopia-commits] r608 - in packages/experimental/hal/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-02-17 21:38:27 +0000 (Fri, 17 Feb 2006)
New Revision: 608

Removed:
   packages/experimental/hal/debian/patches/storage-policy-debian.patch
Modified:
   packages/experimental/hal/debian/changelog
   packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch
   packages/experimental/hal/debian/rules
Log:
* debian/patches/storage-policy-debian.patch
  + Removed. Obsolete

Modified: packages/experimental/hal/debian/changelog
===================================================================
--- packages/experimental/hal/debian/changelog	2006-02-17 21:24:33 UTC (rev 607)
+++ packages/experimental/hal/debian/changelog	2006-02-17 21:38:27 UTC (rev 608)
@@ -16,8 +16,10 @@
     + force-reload dbus instead of reload
     + Remove obsolete fdi example conffile
     + Add small utility script to run hald from the debian dir.
+  * debian/patches/storage-policy-debian.patch
+    + Removed. Obsolete
 
- -- Sjoerd Simons <sjoerd at debian.org>  Fri, 17 Feb 2006 22:24:01 +0100
+ -- Sjoerd Simons <sjoerd at debian.org>  Fri, 17 Feb 2006 22:38:05 +0100
 
 hal (0.5.6-4) unstable; urgency=high
 

Modified: packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch
===================================================================
--- packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch	2006-02-17 21:24:33 UTC (rev 607)
+++ packages/experimental/hal/debian/patches/02_hal_addon_pmu.patch	2006-02-17 21:38:27 UTC (rev 608)
@@ -1,8 +1,3 @@
-Index: hald/linux2/addons/addon-pmu.c
-===================================================================
-RCS file: /cvs/hal/hal/hald/linux2/addons/addon-pmu.c,v
-retrieving revision 1.5
-diff -u -r1.5 addon-pmu.c
 --- hald/linux2/addons/addon-pmu.c	18 Jan 2006 23:22:33 -0000	1.5
 +++ hald/linux2/addons/addon-pmu.c	17 Feb 2006 19:25:53 -0000
 @@ -66,23 +66,8 @@

Deleted: packages/experimental/hal/debian/patches/storage-policy-debian.patch
===================================================================
--- packages/experimental/hal/debian/patches/storage-policy-debian.patch	2006-02-17 21:24:33 UTC (rev 607)
+++ packages/experimental/hal/debian/patches/storage-policy-debian.patch	2006-02-17 21:38:27 UTC (rev 608)
@@ -1,64 +0,0 @@
-diff -ruN hal-0.5.4-old/fdi/policy/10osvendor/10-storage-policy.fdi hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi
---- hal-0.5.4-old/fdi/policy/10osvendor/10-storage-policy.fdi	2005-05-23 16:06:27.000000000 +0200
-+++ hal-0.5.4/fdi/policy/10osvendor/10-storage-policy.fdi	2005-08-27 17:55:01.000000000 +0200
-@@ -6,11 +6,11 @@
-   <device>
-     <match key="info.udi" string="/org/freedesktop/Hal/devices/computer">
-       <merge key="storage.policy.default.mount_root" type="string">/media</merge>
--      <merge key="storage.policy.default.use_managed_keyword" type="bool">true</merge>
--      <merge key="storage.policy.default.managed_keyword.primary" type="string">managed</merge>
--      <merge key="storage.policy.default.managed_keyword.secondary" type="string">kudzu</merge>
-+      <merge key="storage.policy.default.use_managed_keyword" type="bool">false</merge>
-+      <merge key="storage.policy.default.managed_keyword.primary" type="string">comment=fstabsync</merge>
-+      <merge key="storage.policy.default.managed_keyword.secondary" type="string">managed</merge>
-       <merge key="storage.policy.default.mount_option.noauto" type="bool">true</merge>
--      <merge key="storage.policy.default.mount_option.pamconsole" type="bool">true</merge>
-+      <merge key="storage.policy.default.mount_option.user" type="bool">true</merge>
-       <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
-     </match>
-   </device>
-@@ -44,6 +44,19 @@
-       </match>
-     </match>
- 
-+    <!-- Use UTF-8 charset and the quiet option for vfat -->
-+    <match key="volume.fstype" string="vfat">
-+      <merge key="volume.policy.mount_option.iocharset=utf8" type="bool">true</merge>
-+      <merge key="volume.policy.mount_option.quiet" type="bool">true</merge>
-+    </match>
-+    <!-- cdrom filesystems should be mounted with the utf8 option -->
-+    <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>
-+
-     <!-- Handle drives with non-partitioned media  -->
-     <match key="storage.no_partitions_hint" bool="true">
-       <!-- optical drives -->
-@@ -96,6 +109,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) -->
-+	<match key="@block.storage_device:storage.no_partitions_hint" bool="true">
-+	  <merge key="volume.policy.desired_mount_point" type="copy_property">@block.storage_device:storage.policy.desired_mount_point</merge>
-+	</match>
- 	<match key="@block.storage_device:storage.no_partitions_hint" bool="false">
- 
- 	  <merge key="volume.policy.should_mount" type="bool">true</merge>
-@@ -195,5 +211,13 @@
-       <append key="info.addons" type="strlist">hald-addon-storage</append>
-     </match>
-   </device>
--  
-+
-+  <!-- Always eject USB storage devices to properly power them off -->
-+  <device>
-+    <match key="info.category" string="storage">
-+      <match key="storage.bus" string="usb">
-+        <merge key="storage.requires_eject" type="bool">true</merge>
-+      </match>
-+    </match>
-+  </device>
- </deviceinfo>

Modified: packages/experimental/hal/debian/rules
===================================================================
--- packages/experimental/hal/debian/rules	2006-02-17 21:24:33 UTC (rev 607)
+++ packages/experimental/hal/debian/rules	2006-02-17 21:38:27 UTC (rev 608)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_TAR_SRCDIR=hal-0.5.6
+DEB_TAR_SRCDIR=hal-0.5.6+cvs20060217
 
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk