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

[Sjoerd Simons]

Author: sjoerd
Date: 2004-11-06 05:45:41 -0700 (Sat, 06 Nov 2004)
New Revision: 62

Added:
   packages/hal/trunk/debian/patches/hal-fdi.patch
Modified:
   packages/hal/trunk/debian/changelog
   packages/hal/trunk/debian/hal.dirs
   packages/hal/trunk/debian/rules
Log:
Move user configurable fdi files to /etc/hal/fdi

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-11-05 20:37:04 UTC (rev 61)
+++ packages/hal/trunk/debian/changelog	2004-11-06 12:45:41 UTC (rev 62)
@@ -13,6 +13,8 @@
     + debian/patches/storage-policy-uudi.patch
   * debian/patches/storage-policy-debian.patch
     Updated. Usage comment=fstabsync as option for fstab-sync mount lines
+  * debian/patches/hal-fdi.patch
+    Added. Look for user fdi files in /etc/hal/fdi
 
  -- Sjoerd Simons <sjoerd@debian.org>  Tue, 19 Oct 2004 16:59:21 +0200
 

Modified: packages/hal/trunk/debian/hal.dirs
===================================================================
--- packages/hal/trunk/debian/hal.dirs	2004-11-05 20:37:04 UTC (rev 61)
+++ packages/hal/trunk/debian/hal.dirs	2004-11-06 12:45:41 UTC (rev 62)
@@ -1 +1,2 @@
 /var/run/hal
+/etc/hal/fdi

Added: packages/hal/trunk/debian/patches/hal-fdi.patch
===================================================================
--- packages/hal/trunk/debian/patches/hal-fdi.patch	2004-11-05 20:37:04 UTC (rev 61)
+++ packages/hal/trunk/debian/patches/hal-fdi.patch	2004-11-06 12:45:41 UTC (rev 62)
@@ -0,0 +1,19 @@
+Index: hald/device_info.c
+===================================================================
+RCS file: /cvs/hal/hal/hald/device_info.c,v
+retrieving revision 1.16
+diff -u -r1.16 device_info.c
+--- hald/device_info.c	14 Oct 2004 18:37:28 -0000	1.16
++++ hald/device_info.c	28 Oct 2004 18:57:31 -0000
+@@ -1176,7 +1176,10 @@
+ di_search_and_merge (HalDevice *d)
+ {
+ 
+-	return scan_fdi_files (PACKAGE_DATA_DIR "/hal/fdi", d);
++	dbus_bool_t ret;
++
++	ret = scan_fdi_files (PACKAGE_DATA_DIR "/hal/fdi", d);
++	return scan_fdi_files (PACKAGE_SYSCONF_DIR "/hal/fdi", d) || ret;
+ }
+ 
+ /** @} */

Modified: packages/hal/trunk/debian/rules
===================================================================
--- packages/hal/trunk/debian/rules	2004-11-05 20:37:04 UTC (rev 61)
+++ packages/hal/trunk/debian/rules	2004-11-06 12:45:41 UTC (rev 62)
@@ -21,3 +21,4 @@
 	install -d $(DEB_DESTDIR)/etc/dbus-1/event.d
 	install -m 755 debian/hal.init.dbus \
 		$(DEB_DESTDIR)/etc/dbus-1/event.d/hal
+	rmdir $(DEB_DESTDIR)/usr/share/hal/fdi/95userpolicy