hal ChangeLog, 1.913, 1.914 Makefile.am, 1.17, 1.18 configure.in, 1.129, 1.130

[David Zeuthen]

Update of /cvs/hal/hal
In directory kemper:/tmp/cvs-serv27813

Modified Files:
	ChangeLog Makefile.am configure.in 
Log Message:
2006-06-05  David Zeuthen  <davidz at redhat.com>

        * hald/hald_dbus.c:
        (hald_exec_method): Export a new environment variable with the
        unique name for callers system bus connection called
        HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME

        * policy/*: Move these to privileges instead

        * privileges/*: Moved from policy/txt/*

        * Makefile.am: Fix up subdirs

        * configure.in: Adjust for new dirs and remove comment about
        libhal-policy. Require PolicyKit >= 0.2 (which is polkit CVS).
        Don't read weird options from the polkit pc file.

        * tools/*: Update to new PolicyKit API and DTRT so things work
        using hald/run-hald.sh



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.913
retrieving revision 1.914
diff -u -d -r1.913 -r1.914
--- ChangeLog	5 Jun 2006 15:44:09 -0000	1.913
+++ ChangeLog	5 Jun 2006 23:56:00 -0000	1.914
@@ -1,3 +1,23 @@
+2006-06-05  David Zeuthen  <davidz at redhat.com>
+	
+	* hald/hald_dbus.c:
+	(hald_exec_method): Export a new environment variable with the
+	unique name for callers system bus connection called
+	HAL_METHOD_INVOKED_BY_SYSTEMBUS_CONNECTION_NAME
+
+	* policy/*: Move these to privileges instead
+
+	* privileges/*: Moved from policy/txt/*
+	
+	* Makefile.am: Fix up subdirs
+
+	* configure.in: Adjust for new dirs and remove comment about
+	libhal-policy. Require PolicyKit >= 0.2 (which is polkit CVS).
+	Don't read weird options from the polkit pc file.
+
+	* tools/*: Update to new PolicyKit API and DTRT so things work
+	using hald/run-hald.sh
+
 2006-06-05  Sjoerd Simons <sjoerd at luon.net>
 
 	* configure.in: Added Catalan translation to ALL_LINGUAS 

Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/Makefile.am,v
retrieving revision 1.17
retrieving revision 1.18
diff -u -d -r1.17 -r1.18
--- Makefile.am	8 Mar 2006 04:14:09 -0000	1.17
+++ Makefile.am	5 Jun 2006 23:56:00 -0000	1.18
@@ -1,7 +1,7 @@
 ## Process this file with automake to produce Makefile.in
 
 SUBDIRS = volume_id libhal libhal-storage hald hald-runner tools \
-          fdi doc examples po policy
+          fdi doc examples po privileges
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = hal.pc hal-storage.pc

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.129
retrieving revision 1.130
diff -u -d -r1.129 -r1.130
--- configure.in	5 Jun 2006 15:44:09 -0000	1.129
+++ configure.in	5 Jun 2006 23:56:00 -0000	1.130
@@ -12,7 +12,7 @@
 AM_CONFIG_HEADER(config.h)
 AM_MAINTAINER_MODE
 
-# libtool versioning - this applies to libhal, libhal-storage and libhal-policy
+# libtool versioning - this applies to libhal and libhal-storage
 #
 # See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
 #
@@ -179,20 +179,10 @@
 
 glib_module="glib-2.0 >= 2.6.0"
 dbus_module="dbus-1 >= 0.33"
-polkit_module="polkit >= 0.1"
+polkit_module="polkit >= 0.2"
 pkg_modules="$glib_module, gobject-2.0 >= 2.6.0, dbus-glib-1 >= 0.33, $dbus_module, $polkit_module"
 PKG_CHECK_MODULES(PACKAGE, [$pkg_modules])
 
-POLKIT_USER=`$PKG_CONFIG --variable=user polkit`
-POLKIT_GROUP=`$PKG_CONFIG --variable=group polkit`
-POLKIT_TXTSRC=`$PKG_CONFIG --variable=txtsrc polkit`
-AC_SUBST(POLKIT_USER)
-AC_SUBST(POLKIT_GROUP)
-AC_SUBST(POLKIT_TXTSRC)
-AC_DEFINE_UNQUOTED(POLKIT_USER,"$POLKIT_USER", [User for PolicyKit])
-AC_DEFINE_UNQUOTED(POLKIT_GROUP,"$POLKIT_GROUP", [Group for PolicyKit])
-AC_DEFINE_UNQUOTED(POLKIT_TXTSRC,"$POLKIT_TXTSRC", [Location of text files for PolicyKit])
-
 EXPAT_LIB=""
 AC_ARG_WITH(expat, [  --with-expat=<dir>      ese expat from here],
                       [
@@ -423,8 +413,7 @@
 tools/device-manager/hal-device-manager
 tools/device-manager/Makefile
 tools/device-manager/Const.py
-policy/Makefile
-policy/txt/Makefile
+privileges/Makefile
 fdi/Makefile
 fdi/preprobe/Makefile
 fdi/preprobe/10osvendor/Makefile