[PATCH] Re: HAL 0.1 release

[Martin Waitz]

hi :)

some minor changes...
i'll hope to come up with real patches later ;)

i needed this to get hald to connect to dbus correctly:

--- hal-0.1.orig/hal.conf
+++ hal-0.1/hal.conf
@@ -56,6 +56,8 @@
     <allow send="org.freedesktop.Hal.libhal.DeviceEnabled"/>
     <allow send="org.freedesktop.Hal.libhal.DeviceRequireUser"/>
     <allow send="org.freedesktop.Hal.libhal.DevicePropertyChanged"/>
+
+    <allow own="org.freedesktop.Hal"/>
   </policy>
 
 </busconfig>



i think these programs belong to sbin instead of bin.
or put everything into sbin?

--- hal-0.1.orig/hald/Makefile.am
+++ hal-0.1/hald/Makefile.am
@@ -6,7 +6,7 @@
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	@PACKAGE_CFLAGS@
 
-bin_PROGRAMS = hald
+sbin_PROGRAMS = hald
 
 hald_SOURCES =                                           \
 	hald.c                                           \
--- hal-0.1.orig/hal_hotplug/Makefile.am
+++ hal-0.1/hal_hotplug/Makefile.am
@@ -5,7 +5,7 @@
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	@PACKAGE_CFLAGS@
 
-bin_PROGRAMS = hal_hotplug
+sbin_PROGRAMS = hal_hotplug
 
 hal_hotplug_SOURCES =                                           \
 	hal_hotplug.c
--- hal-0.1.orig/hal_disable_device/Makefile.am
+++ hal-0.1/hal_disable_device/Makefile.am
@@ -5,7 +5,7 @@
 	-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
 	@PACKAGE_CFLAGS@
 
-bin_PROGRAMS = hal_disable_device
+sbin_PROGRAMS = hal_disable_device
 
 hal_disable_device_SOURCES = \
 	hal_disable_device.c


the following are needed for packaging hal:

--- hal-0.1.orig/Makefile.am
+++ hal-0.1/Makefile.am
@@ -19,8 +19,9 @@
 ### install / uninstall of hal.conf into D-BUS system.d
 
 install-data-local :
-	$(INSTALL_DATA) hal.conf $(DBUS_SYS_DIR)
+	$(mkinstalldirs) $(DESTDIR)$(DBUS_SYS_DIR)
+	$(INSTALL_DATA) hal.conf $(DESTDIR)$(DBUS_SYS_DIR)
 
 uninstall-local :
-	rm -f $(DBUS_SYS_DIR)/hal.conf
+	rm -f $(DESTDIR)$(DBUS_SYS_DIR)/hal.conf
 
--- hal-0.1.orig/hal_scripts/Makefile.am
+++ hal-0.1/hal_scripts/Makefile.am
@@ -6,8 +6,8 @@
 EXTRA_DIST = $(scriptfiles)
 
 install-data-local :
-	$(mkinstalldirs) $(scriptdir)
-	$(INSTALL_SCRIPT) $(scriptfiles) $(scriptdir)
+	$(mkinstalldirs) $(DESTDIR)$(scriptdir)
+	$(INSTALL_SCRIPT) $(scriptfiles) $(DESTDIR)$(scriptdir)
 
 uninstall-local:
-	rm -rf $(scriptdir)
+	rm -rf $(DESTDIR)$(scriptdir)
--- hal-0.1.orig/device_info_files/Makefile.am
+++ hal-0.1/device_info_files/Makefile.am
@@ -3,6 +3,6 @@
 SUBDIRS = 00fallback 10freedesktop
 
 uninstall-local:
-	rm -rf $(localstatedir)/hal/fdi
+	rm -rf $(DESTDIR)$(localstatedir)/hal/fdi
 
 
--- hal-0.1.orig/device_info_files/00fallback/Makefile.am
+++ hal-0.1/device_info_files/00fallback/Makefile.am
@@ -6,8 +6,8 @@
 EXTRA_DIST = $(fdifiles)
 
 install-data-local :
-	$(mkinstalldirs) $(fdidir)
-	$(INSTALL_SCRIPT) $(fdifiles) $(fdidir)
+	$(mkinstalldirs) $(DESTDIR)$(fdidir)
+	$(INSTALL_SCRIPT) $(fdifiles) $(DESTDIR)$(fdidir)
 
 
 
--- hal-0.1.orig/device_info_files/10freedesktop/Makefile.am
+++ hal-0.1/device_info_files/10freedesktop/Makefile.am
@@ -6,8 +6,8 @@
 EXTRA_DIST = $(fdifiles)
 
 install-data-local :
-	$(mkinstalldirs) $(fdidir)
-	$(INSTALL_SCRIPT) $(fdifiles) $(fdidir)
+	$(mkinstalldirs) $(DESTDIR)$(fdidir)
+	$(INSTALL_SCRIPT) $(fdifiles) $(DESTDIR)$(fdidir)
 
 
 
-- 
CU,		  / Friedrich-Alexander University Erlangen, Germany
Martin Waitz	//  Department of Computer Science 3       _________
______________/// - - - - - - - - - - - - - - - - - - - - ///
dies ist eine manuell generierte mail, sie beinhaltet    //
tippfehler und ist auch ohne grossbuchstaben gueltig.   /
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 189 bytes
Desc: Digital signature
Url : http://lists.freedesktop.org/archives/xdg/attachments/20031106/13cdb526/attachment.pgp