hal: Branch 'hal-0_5_8-branch' - 3 commits

[David Zeuthen]

 NEWS                   |   19 +++++++++++++++++++
 configure.in           |    2 +-
 privileges/Makefile.am |    2 ++
 3 files changed, 22 insertions(+), 1 deletion(-)

New commits:
diff-tree 099ced9bbe3b7d3d24a50809faaa6319cc3971e9 (from 96d32014f4439fd434f796518f9f90afd11ec7fa)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Sep 13 14:20:44 2006 -0400

    fixup NEWS file to list correct requirements, e.g. udev 089

diff --git a/NEWS b/NEWS
index 9622500..a2e9c6c 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,23 @@
 ==========
+HAL 0.5.8.1
+==========
+
+Requirements for HAL 0.5.8.1
+
+ - Linux kernel     >= 2.6.17
+ - util-linux       >= 2.12r1
+ - bash             >= 2.0
+ - udev             >= 089
+ - dbus             >= 0.60      (with glib bindings)
+ - glib             >= 2.6.0
+ - expat            >= 1.95.8
+ - libusb           >= 0 0.1.10a (optional)
+ - pciutils         >= 2.2.3     (optional
+ - dmidecode        >= 2.7       (optional)
+ - parted           == 1.7.1     (optional)
+ - cryptsetup-luks  >= 1.0.1     (optional, needs LUKS patches)
+
+==========
 HAL 0.5.8 "The Skynet Funding Bill is passed."
 ==========
 
diff-tree 96d32014f4439fd434f796518f9f90afd11ec7fa (from 212f449c695035d5489ada4c5f4bce6d4043c8d0)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Sep 13 14:16:39 2006 -0400

    only require libvolume_id >= 061
    
    This is to avoid requiring a too new udev for people on old distributions.
    Note that libvolume_id >= 061 is provided only by udev >= 089.
    (cherry picked from 4efec60712d17f2fcf27cc1bc33b80072e9c3778 commit)

diff --git a/configure.in b/configure.in
index fe5235b..7a17d55 100644
--- a/configure.in
+++ b/configure.in
@@ -14,7 +14,7 @@ AM_MAINTAINER_MODE
 
 glib_module="glib-2.0 >= 2.6.0 dbus-glib-1 >= 0.61"
 dbus_module="dbus-1 >= 0.61"
-volume_id_module="libvolume_id >= 0.66"
+volume_id_module="libvolume_id >= 0.61"
 polkit_module="polkit >= 0.2"
 
 # libtool versioning - this applies to libhal and libhal-storage
diff-tree 212f449c695035d5489ada4c5f4bce6d4043c8d0 (from 9908332fe9d43eb2e20e690686d06a1f5cbcee57)
Author: David Zeuthen <davidz at redhat.com>
Date:   Wed Sep 13 14:14:32 2006 -0400

    only install PolicyKit privilege files if we're using PolicyKit
    (cherry picked from 76c241fdd5ffb05ff40beee1207d1c74f076b99c commit)

diff --git a/privileges/Makefile.am b/privileges/Makefile.am
index d300a60..805dc67 100644
--- a/privileges/Makefile.am
+++ b/privileges/Makefile.am
@@ -1,4 +1,5 @@
 
+if HAVE_POLKIT
 polkit_privilegedir = $(sysconfdir)/PolicyKit/privilege.d
 
 dist_polkit_privilege_DATA =                              \
@@ -11,6 +12,7 @@ dist_polkit_privilege_DATA =            
 	hal-power-poweroff.privilege                      \
 	hal-power-reboot.privilege                        \
 	hal-power-cpufreq.privilege
+endif
 
 clean-local :
 	rm -f *~