hal: Branch 'master' - 2 commits

[David Zeuthen]

Kay, this is OK to do? I spent quite some time hunting down what the
minimal version of udev/libvolume_id we can depend on... Turns out
089/061 is the lucky number. Looks good?

Btw, is it possible you can sync libvolume_id version numbers with udev
version numbers? Would make everything somewhat easier...

Thanks,
David

On Wed, 2006-09-13 at 11:17 -0700, David Zeuthen wrote:
>  configure.in           |    2 +-
>  privileges/Makefile.am |    2 ++
>  2 files changed, 3 insertions(+), 1 deletion(-)
> 
> New commits:
> diff-tree 4efec60712d17f2fcf27cc1bc33b80072e9c3778 (from 76c241fdd5ffb05ff40beee1207d1c74f076b99c)
> 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.
> 
> diff --git a/configure.in b/configure.in
> index 2b31e91..a2688f3 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 76c241fdd5ffb05ff40beee1207d1c74f076b99c (from ffcbc8ac4a06fed7522ee4c2060fb9392d56a6dd)
> 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
> 
> 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 *~
> _______________________________________________
> hal-commit mailing list
> hal-commit at lists.freedesktop.org
> http://lists.freedesktop.org/mailman/listinfo/hal-commit