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

[Sjoerd Simons]

Author: sjoerd
Date: 2004-11-26 12:34:05 -0700 (Fri, 26 Nov 2004)
New Revision: 128

Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/control
   packages/hal/trunk/debian/patches/storage-policy-debian.patch
Log:
Remove usaged of managed keyword, so we don't have to depend on a frozen mount


Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-11-24 11:49:28 UTC (rev 127)
+++ packages/hal/trunk/debian/changelog	2004-11-26 19:34:05 UTC (rev 128)
@@ -16,6 +16,9 @@
   * /etc/hal/fdi/preferences.fdi
     + Added. Some examples of system settings that can be tweaked via hal's
       database.
+  * debian/patches/storage-policy-debian.patch.
+    + Updated. Disable the managed keyword again, so we don't have to depend
+    on a mount version that's already frozen.
 
  -- Sjoerd Simons <sjoerd@debian.org>  Mon,  8 Nov 2004 23:59:23 +0100
 

Modified: packages/hal/trunk/debian/control
===================================================================
--- packages/hal/trunk/debian/control	2004-11-24 11:49:28 UTC (rev 127)
+++ packages/hal/trunk/debian/control	2004-11-26 19:34:05 UTC (rev 128)
@@ -7,7 +7,7 @@
 
 Package: hal
 Architecture: any
-Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev, mount (>= 2.12h)
+Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev
 Conflicts: gnome-volume-manager (<< 0.9.10), pmount (<< 0.4.2)
 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-24 11:49:28 UTC (rev 127)
+++ packages/hal/trunk/debian/patches/storage-policy-debian.patch	2004-11-26 19:34:05 UTC (rev 128)
@@ -1,12 +1,14 @@
 diff -Naur hal-0.4.1.orig/fdi/90defaultpolicy/storage-policy.fdi hal-0.4.1/fdi/90defaultpolicy/storage-policy.fdi
---- hal-0.4.1.orig/fdi/90defaultpolicy/storage-policy.fdi	2004-11-18 21:19:29.147300939 +0100
-+++ hal-0.4.1/fdi/90defaultpolicy/storage-policy.fdi	2004-11-18 21:26:37.652116329 +0100
-@@ -7,10 +7,10 @@
+--- hal-0.4.1.orig/fdi/90defaultpolicy/storage-policy.fdi	2004-10-28 18:29:30.000000000 +0200
++++ hal-0.4.1/fdi/90defaultpolicy/storage-policy.fdi	2004-11-26 20:27:15.014047321 +0100
+@@ -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.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>