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

[Sjoerd Simons]

Author: sjoerd
Date: 2004-11-04 13:38:07 -0700 (Thu, 04 Nov 2004)
New Revision: 60

Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/control
   packages/hal/trunk/debian/patches/storage-policy-debian.patch
Log:
Use comment=fstabsync in fstab-sync generated fstab lines

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-11-04 19:47:49 UTC (rev 59)
+++ packages/hal/trunk/debian/changelog	2004-11-04 20:38:07 UTC (rev 60)
@@ -12,8 +12,9 @@
     + debian/patches/fstab-sync.patch 
     + debian/patches/nonblock.patch 
     + debian/patches/storage-policy-uudi.patch
+  * debian/patches/storage-policy-debian.patch
+    Updated. Usage comment=fstabsync as option for fstab-sync mount lines
 
-
  -- Sjoerd Simons <sjoerd@debian.org>  Tue, 19 Oct 2004 16:59:21 +0200
 
 hal (0.4.0-1) experimental; urgency=low

Modified: packages/hal/trunk/debian/control
===================================================================
--- packages/hal/trunk/debian/control	2004-11-04 19:47:49 UTC (rev 59)
+++ packages/hal/trunk/debian/control	2004-11-04 20:38:07 UTC (rev 60)
@@ -7,7 +7,7 @@
 
 Package: hal
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev
+Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev, mount (>= 2.12h)
 Conflicts: gnome-volume-manager (<< 0.9.10)
 Suggests: hal-device-manager
 Description: Hardware Abstraction Layer

Modified: packages/hal/trunk/debian/patches/storage-policy-debian.patch
===================================================================
--- packages/hal/trunk/debian/patches/storage-policy-debian.patch	2004-11-04 19:47:49 UTC (rev 59)
+++ packages/hal/trunk/debian/patches/storage-policy-debian.patch	2004-11-04 20:38:07 UTC (rev 60)
@@ -1,19 +1,16 @@
---- fdi/90defaultpolicy/storage-policy.fdi.orig	2004-10-19 16:38:21.000000000 +0200
-+++ fdi/90defaultpolicy/storage-policy.fdi	2004-10-19 16:39:08.000000000 +0200
-@@ -6,12 +6,13 @@
-   <device>
+--- fdi/90defaultpolicy/storage-policy.fdi.orig	2004-11-04 20:51:03.000000000 +0100
++++ fdi/90defaultpolicy/storage-policy.fdi	2004-11-04 21:20:09.000000000 +0100
+@@ -7,10 +7,10 @@
      <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.use_managed_keyword" type="bool">false</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">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.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.exec" type="bool">true</merge>
 +      <merge key="storage.policy.default.mount_option.user" type="bool">true</merge>
-+      <merge key="storage.policy.default.mount_option.noexec" type="bool">true</merge>
-+      <merge key="storage.policy.default.mount_option.nosuid" type="bool">true</merge>
+       <merge key="storage.policy.default.mount_option.exec" type="bool">true</merge>
      </match>
    </device>
-