Hello community,
here is the log from the commit of package hal
checked in at Fri Nov 3 15:29:33 CET 2006.
--------
--- hal/hal.changes 2006-10-30 16:15:10.000000000 +0100
+++ /mounts/work_src_done/STABLE/hal/hal.changes 2006-11-03 15:11:08.000000000 +0100
@@ -1,0 +2,11 @@
+Fri Nov 3 14:33:19 CET 2006 - dkukawka@suse.de
+
+- added patches:
+ - hal-fix-wireless_detection_rt2500pci.diff: fix for b.n.c bug
+ #217419
+ - hal-fix-path_eject_binary.diff: fixed path to eject binary
+ b.n.c bug #214820 (temporary fix)
+- removed upstream gone patches:
+ - hal-fix-cpufreq-dbus-restart.patch
+
+-------------------------------------------------------------------
Old:
----
hal-0.5.8_git20061027.tar.bz2
hal-fix-cpufreq-dbus-restart.patch
New:
----
hal-0.5.8_git20061103.tar.bz2
hal-fix-path_eject_binary.diff
hal-fix-wireless_detection_rt2500pci.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.JHIMr2/_old 2006-11-03 15:28:09.000000000 +0100
+++ /var/tmp/diff_new_pack.JHIMr2/_new 2006-11-03 15:28:09.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package hal (Version 0.5.8_git20061027)
+# spec file for package hal (Version 0.5.8_git20061103)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,7 +18,7 @@
%define dbus_release 1
License: Other uncritical OpenSource License, Other License(s), see package
Group: System/Daemons
-Version: 0.5.8_git20061027
+Version: 0.5.8_git20061103
Release: 1
Autoreqprov: on
Summary: Daemon for Collecting Hardware Information
@@ -26,6 +26,8 @@
Patch0: %{name}-add-tabletPC_support.diff
Patch1: %{name}-fix-mount_options.diff
Patch2: %{name}-panasonic-acpi-suse.diff
+# SUSE specific temporary patches
+Patch10: hal-fix-path_eject_binary.diff
# only on SLED10 to avoid dbus update
Patch50: hal-back_to_dbus_0.6.0.diff
#
@@ -37,7 +39,7 @@
Patch104: hal-pci.diff
Patch105: hal-add-pm-utils-support.diff
Patch106: hal-configure.diff
-Patch107: hal-fix-cpufreq-dbus-restart.patch
+Patch107: hal-fix-wireless_detection_rt2500pci.diff
#
# patches for testing:
#Patch300: hal_debug.diff
@@ -143,6 +145,7 @@
%patch104
%patch105
%patch106
+%patch10 -p1
%patch107 -p1
#%patch300
@@ -258,6 +261,14 @@
%{_bindir}/hal-device-manager
%changelog -n hal
+* Fri Nov 03 2006 - dkukawka@suse.de
+- added patches:
+ - hal-fix-wireless_detection_rt2500pci.diff: fix for b.n.c bug
+ [#217419]
+ - hal-fix-path_eject_binary.diff: fixed path to eject binary
+ b.n.c bug #214820 (temporary fix)
+- removed upstream gone patches:
+ - hal-fix-cpufreq-dbus-restart.patch
* Mon Oct 30 2006 - dkukawka@suse.de
- fixed bugs:
- b.n.c #210297: added --datadir to spec file
++++++ hal-0.5.8_git20061027.tar.bz2 -> hal-0.5.8_git20061103.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/ChangeLog new/hal-0.5.8_git20061103/ChangeLog
--- old/hal-0.5.8_git20061027/ChangeLog 2006-10-27 20:30:58.000000000 +0200
+++ new/hal-0.5.8_git20061103/ChangeLog 2006-11-03 14:54:47.000000000 +0100
@@ -1,3 +1,75 @@
+commit 4b6eebfadb9e4166dd23632c0a381705d4044d0b
+Author: Holger Macht
+Date: Fri Nov 3 09:50:53 2006 +0100
+
+ Fix the D-Bus restart case for the CPUFreq addon. The D-Bus
+ connection you
+ get with libhal_ctx_init_direct is just good for talking to the HAL
+ daemon, but not for talking to others like PolicyKit. So for other
+ D-Bus
+ messages, we need to use another connection which I have to reconnect
+ properly after a D-Bus restart.
+
+ hald/linux/addons/addon-cpufreq.c | 50
+ +++++++++++++++++++++++++++----------
+ hald/linux/addons/addon-cpufreq.h | 2 +
+ 2 files changed, 39 insertions(+), 13 deletions(-)
+
+commit 72cef4fedb8ab245a09826f428bb429d8c7e0371
+Author: Richard Hughes
+Date: Wed Nov 1 13:13:39 2006 +0000
+
+ ignore the special ACPI 'Ones' value for rate
+
+ As discovered in : http://bugzilla.gnome.org/show_bug.cgi?id=348201
+ ACPI gives out the special 'Ones' value for rate when it's unable to
+ calculate the true rate.
+ We should set the rate zero, and wait for the BIOS to stabilise
+ for the
+ few BIOS's that give 0xffff as the very first entry after an AC state
+ change.
+ This patch has been tested to work by Pierre Ossman.
+
+ hald/linux/acpi.c | 11 +++++++++++
+ 1 files changed, 11 insertions(+), 0 deletions(-)
+
+commit b4d7405bded1c621e73fe28826dbd7df6343b05f
+Author: Richard Hughes
+Date: Wed Nov 1 13:10:01 2006 +0000
+
+ allow make distcheck to work with a readonly buildroot
+
+ Instead of playing games with glib-genmarshal, invoke it without
+ using a temporary file.
+ Writing temporary files into src and then deleting them makes make
+ distcheck fail on Ubuntu Edgy, and this patch fixes it.
+
+ hald/Makefile.am | 12 ++++--------
+ 1 files changed, 4 insertions(+), 8 deletions(-)
+
+commit dc1d6286d49990a4226cb917c821d26e1e15a97a
+Author: Richard Hughes
+Date: Wed Nov 1 13:05:21 2006 +0000
+
+ allow build without PolicyKit
+
+ This patch lets make distcheck work by passing the
+ --disable-policy-kit falg to configure ONLY when doing
+ make distcheck.
+
+ Makefile.am | 2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+commit 8ffd9707244b28a14d3756ddec8f73b0401dd1c0
+Author: Doug Chapman
+Date: Fri Oct 27 13:31:24 2006 -0400
+
+ fix unaligned messages (RH Bug #210079)
+
+ hald-runner/main.c | 2 +-
+ partutil/partutil.c | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
commit c85e02d58d6503b494bb4c8584a7c44ac6923208
Author: Timo Hoenig
Date: Mon Oct 23 11:35:17 2006 -0400
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/Makefile.am new/hal-0.5.8_git20061103/Makefile.am
--- old/hal-0.5.8_git20061027/Makefile.am 2006-10-27 18:22:20.000000000 +0200
+++ new/hal-0.5.8_git20061103/Makefile.am 2006-11-03 14:15:29.000000000 +0100
@@ -33,6 +33,8 @@
DISTCLEANFILES = hal.pc hal-storage.pc intltool-extract intltool-merge intltool-update
+DISTCHECK_CONFIGURE_FLAGS = --disable-policy-kit
+
EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in intltool-extract.in intltool-merge.in intltool-update.in mkinstalldirs ChangeLog
clean-local :
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/Makefile.in new/hal-0.5.8_git20061103/Makefile.in
--- old/hal-0.5.8_git20061027/Makefile.in 2006-10-27 19:03:38.000000000 +0200
+++ new/hal-0.5.8_git20061103/Makefile.in 2006-11-03 14:41:10.000000000 +0100
@@ -42,7 +42,7 @@
$(srcdir)/hal.conf.in $(srcdir)/hal.pc.in \
$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
config.guess config.sub depcomp install-sh ltmain.sh missing \
- py-compile
+ mkinstalldirs py-compile
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
@@ -51,7 +51,7 @@
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno configure.status.lineno
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = config.h
CONFIG_CLEAN_FILES = hal.pc hal-storage.pc hal.conf
SOURCES =
@@ -319,6 +319,7 @@
dist_dbus_DATA = hal.conf
MAINTAINERCLEANFILES = ChangeLog
DISTCLEANFILES = hal.pc hal-storage.pc intltool-extract intltool-merge intltool-update
+DISTCHECK_CONFIGURE_FLAGS = --disable-policy-kit
EXTRA_DIST = HACKING hal.pc.in hal-storage.pc.in hal.conf.in intltool-extract.in intltool-merge.in intltool-update.in mkinstalldirs ChangeLog
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/configure new/hal-0.5.8_git20061103/configure
--- old/hal-0.5.8_git20061027/configure 2006-10-27 19:03:39.000000000 +0200
+++ new/hal-0.5.8_git20061103/configure 2006-11-03 14:41:11.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for hal 0.5.8_git20061027.
+# Generated by GNU Autoconf 2.59 for hal 0.5.8_git20061103.
#
# Report bugs to .
#
@@ -423,8 +423,8 @@
# Identity of this package.
PACKAGE_NAME='hal'
PACKAGE_TARNAME='hal'
-PACKAGE_VERSION='0.5.8_git20061027'
-PACKAGE_STRING='hal 0.5.8_git20061027'
+PACKAGE_VERSION='0.5.8_git20061103'
+PACKAGE_STRING='hal 0.5.8_git20061103'
PACKAGE_BUGREPORT='dkukawka@suse.de'
# Factoring default headers for most tests.
@@ -989,7 +989,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures hal 0.5.8_git20061027 to adapt to many kinds of systems.
+\`configure' configures hal 0.5.8_git20061103 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1055,7 +1055,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of hal 0.5.8_git20061027:";;
+ short | recursive ) echo "Configuration of hal 0.5.8_git20061103:";;
esac
cat <<\_ACEOF
@@ -1231,7 +1231,7 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
-hal configure 0.5.8_git20061027
+hal configure 0.5.8_git20061103
generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
@@ -1245,7 +1245,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by hal $as_me 0.5.8_git20061027, which was
+It was created by hal $as_me 0.5.8_git20061103, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1888,7 +1888,7 @@
# Define the identity of the package.
PACKAGE=hal
- VERSION=0.5.8_git20061027
+ VERSION=0.5.8_git20061103
cat >>confdefs.h <<_ACEOF
@@ -26293,7 +26293,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by hal $as_me 0.5.8_git20061027, which was
+This file was extended by hal $as_me 0.5.8_git20061103, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -26356,7 +26356,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-hal config.status 0.5.8_git20061027
+hal config.status 0.5.8_git20061103
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/configure.in new/hal-0.5.8_git20061103/configure.in
--- old/hal-0.5.8_git20061027/configure.in 2006-10-27 19:03:10.000000000 +0200
+++ new/hal-0.5.8_git20061103/configure.in 2006-11-03 14:40:21.000000000 +0100
@@ -7,8 +7,8 @@
#
AC_PREREQ(2.57)
-AC_INIT(hal, 0.5.8_git20061027, dkukawka@suse.de)
-AM_INIT_AUTOMAKE(hal, 0.5.8_git20061027)
+AC_INIT(hal, 0.5.8_git20061103, dkukawka@suse.de)
+AM_INIT_AUTOMAKE(hal, 0.5.8_git20061103)
AM_CONFIG_HEADER(config.h)
AM_MAINTAINER_MODE
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/doc/Makefile.in new/hal-0.5.8_git20061103/doc/Makefile.in
--- old/hal-0.5.8_git20061027/doc/Makefile.in 2006-10-27 19:03:31.000000000 +0200
+++ new/hal-0.5.8_git20061103/doc/Makefile.in 2006-11-03 14:41:03.000000000 +0100
@@ -42,7 +42,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/doc/api/Makefile.in new/hal-0.5.8_git20061103/doc/api/Makefile.in
--- old/hal-0.5.8_git20061027/doc/api/Makefile.in 2006-10-27 19:03:32.000000000 +0200
+++ new/hal-0.5.8_git20061103/doc/api/Makefile.in 2006-11-03 14:41:04.000000000 +0100
@@ -49,7 +49,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/doc/conf/Makefile.in new/hal-0.5.8_git20061103/doc/conf/Makefile.in
--- old/hal-0.5.8_git20061027/doc/conf/Makefile.in 2006-10-27 19:03:32.000000000 +0200
+++ new/hal-0.5.8_git20061103/doc/conf/Makefile.in 2006-11-03 14:41:04.000000000 +0100
@@ -43,7 +43,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/doc/spec/Makefile.in new/hal-0.5.8_git20061103/doc/spec/Makefile.in
--- old/hal-0.5.8_git20061027/doc/spec/Makefile.in 2006-10-27 19:03:32.000000000 +0200
+++ new/hal-0.5.8_git20061103/doc/spec/Makefile.in 2006-11-03 14:41:04.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = hal-spec.xml
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/Makefile.in new/hal-0.5.8_git20061103/fdi/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/Makefile.in 2006-10-27 19:03:32.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/Makefile.in 2006-11-03 14:41:04.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/information/10freedesktop/Makefile.in new/hal-0.5.8_git20061103/fdi/information/10freedesktop/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/information/10freedesktop/Makefile.in 2006-10-27 19:03:32.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/information/10freedesktop/Makefile.in 2006-11-03 14:41:04.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/information/20thirdparty/Makefile.in new/hal-0.5.8_git20061103/fdi/information/20thirdparty/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/information/20thirdparty/Makefile.in 2006-10-27 19:03:32.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/information/20thirdparty/Makefile.in 2006-11-03 14:41:04.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/information/30user/Makefile.in new/hal-0.5.8_git20061103/fdi/information/30user/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/information/30user/Makefile.in 2006-10-27 19:03:33.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/information/30user/Makefile.in 2006-11-03 14:41:05.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/information/Makefile.in new/hal-0.5.8_git20061103/fdi/information/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/information/Makefile.in 2006-10-27 19:03:33.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/information/Makefile.in 2006-11-03 14:41:05.000000000 +0100
@@ -42,7 +42,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/policy/10osvendor/Makefile.in new/hal-0.5.8_git20061103/fdi/policy/10osvendor/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/policy/10osvendor/Makefile.in 2006-10-27 19:03:33.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/policy/10osvendor/Makefile.in 2006-11-03 14:41:05.000000000 +0100
@@ -47,7 +47,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/policy/20thirdparty/Makefile.in new/hal-0.5.8_git20061103/fdi/policy/20thirdparty/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/policy/20thirdparty/Makefile.in 2006-10-27 19:03:33.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/policy/20thirdparty/Makefile.in 2006-11-03 14:41:05.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/policy/30user/Makefile.in new/hal-0.5.8_git20061103/fdi/policy/30user/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/policy/30user/Makefile.in 2006-10-27 19:03:33.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/policy/30user/Makefile.in 2006-11-03 14:41:05.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/policy/Makefile.in new/hal-0.5.8_git20061103/fdi/policy/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/policy/Makefile.in 2006-10-27 19:03:34.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/policy/Makefile.in 2006-11-03 14:41:05.000000000 +0100
@@ -42,7 +42,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/preprobe/10osvendor/Makefile.in new/hal-0.5.8_git20061103/fdi/preprobe/10osvendor/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/preprobe/10osvendor/Makefile.in 2006-10-27 19:03:34.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/preprobe/10osvendor/Makefile.in 2006-11-03 14:41:05.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/preprobe/20thirdparty/Makefile.in new/hal-0.5.8_git20061103/fdi/preprobe/20thirdparty/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/preprobe/20thirdparty/Makefile.in 2006-10-27 19:03:34.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/preprobe/20thirdparty/Makefile.in 2006-11-03 14:41:06.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/preprobe/30user/Makefile.in new/hal-0.5.8_git20061103/fdi/preprobe/30user/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/preprobe/30user/Makefile.in 2006-10-27 19:03:34.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/preprobe/30user/Makefile.in 2006-11-03 14:41:06.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/fdi/preprobe/Makefile.in new/hal-0.5.8_git20061103/fdi/preprobe/Makefile.in
--- old/hal-0.5.8_git20061027/fdi/preprobe/Makefile.in 2006-10-27 19:03:35.000000000 +0200
+++ new/hal-0.5.8_git20061103/fdi/preprobe/Makefile.in 2006-11-03 14:41:06.000000000 +0100
@@ -42,7 +42,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald/Makefile.am new/hal-0.5.8_git20061103/hald/Makefile.am
--- old/hal-0.5.8_git20061027/hald/Makefile.am 2006-10-27 18:22:20.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald/Makefile.am 2006-11-03 14:15:29.000000000 +0100
@@ -71,16 +71,12 @@
hald_marshal.list
hald_marshal.h: hald_marshal.list
- cd $(srcdir) \
- && glib-genmarshal --prefix=hald_marshal hald_marshal.list --header >> xgen-gmh \
- && (cmp -s xgen-gmh hald_marshal.h || cp xgen-gmh hald_marshal.h) \
- && rm -f xgen-gmh xgen-gmh~
+ glib-genmarshal $< --prefix=hald_marshal --header > $@
hald_marshal.c: hald_marshal.list
- cd $(srcdir) \
- && glib-genmarshal --prefix=hald_marshal hald_marshal.list --body >> xgen-gmc \
- && (cmp -s xgen-gmc hald_marshal.c || cp xgen-gmc hald_marshal.c) \
- && rm -f xgen-gmc xgen-gmc~
+ echo "#include \"hald_marshal.h\"" > $@ && \
+ glib-genmarshal $< --prefix=hald_marshal --body >> $@
+
install-data-local:
-$(mkdir_p) $(HALD_SOCKET_DIR)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald/Makefile.in new/hal-0.5.8_git20061103/hald/Makefile.in
--- old/hal-0.5.8_git20061027/hald/Makefile.in 2006-10-27 19:03:35.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald/Makefile.in 2006-11-03 14:41:06.000000000 +0100
@@ -46,7 +46,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = haldaemon
am__installdirs = "$(DESTDIR)$(sbindir)" "$(DESTDIR)$(initddir)"
@@ -769,16 +769,11 @@
hald_marshal.h: hald_marshal.list
- cd $(srcdir) \
- && glib-genmarshal --prefix=hald_marshal hald_marshal.list --header >> xgen-gmh \
- && (cmp -s xgen-gmh hald_marshal.h || cp xgen-gmh hald_marshal.h) \
- && rm -f xgen-gmh xgen-gmh~
+ glib-genmarshal $< --prefix=hald_marshal --header > $@
hald_marshal.c: hald_marshal.list
- cd $(srcdir) \
- && glib-genmarshal --prefix=hald_marshal hald_marshal.list --body >> xgen-gmc \
- && (cmp -s xgen-gmc hald_marshal.c || cp xgen-gmc hald_marshal.c) \
- && rm -f xgen-gmc xgen-gmc~
+ echo "#include \"hald_marshal.h\"" > $@ && \
+ glib-genmarshal $< --prefix=hald_marshal --body >> $@
install-data-local:
-$(mkdir_p) $(HALD_SOCKET_DIR)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald/dummy/Makefile.in new/hal-0.5.8_git20061103/hald/dummy/Makefile.in
--- old/hal-0.5.8_git20061027/hald/dummy/Makefile.in 2006-10-27 19:03:35.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald/dummy/Makefile.in 2006-11-03 14:41:07.000000000 +0100
@@ -43,7 +43,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald/linux/Makefile.in new/hal-0.5.8_git20061103/hald/linux/Makefile.in
--- old/hal-0.5.8_git20061027/hald/linux/Makefile.in 2006-10-27 19:03:36.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald/linux/Makefile.in 2006-11-03 14:41:07.000000000 +0100
@@ -43,7 +43,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald/linux/acpi.c new/hal-0.5.8_git20061103/hald/linux/acpi.c
--- old/hal-0.5.8_git20061027/hald/linux/acpi.c 2006-10-27 18:22:20.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald/linux/acpi.c 2006-11-03 14:15:29.000000000 +0100
@@ -132,6 +132,17 @@
"battery.reporting.rate");
/*
+ * ACPI gives out the special 'Ones' value for rate when it's unable
+ * to calculate the true rate. We should set the rate zero, and wait
+ * for the BIOS to stabilise.
+ *
+ * full details here: http://bugzilla.gnome.org/show_bug.cgi?id=348201
+ */
+ if (reporting_rate == 0xffff) {
+ reporting_rate = 0;
+ }
+
+ /*
* We are converting the unknown units into mWh because of ACPI's nature
* of not having a standard "energy" unit.
*
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald/linux/addons/Makefile.in new/hal-0.5.8_git20061103/hald/linux/addons/Makefile.in
--- old/hal-0.5.8_git20061027/hald/linux/addons/Makefile.in 2006-10-27 19:03:36.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald/linux/addons/Makefile.in 2006-11-03 14:41:07.000000000 +0100
@@ -54,7 +54,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
@BUILD_MACBOOKPRO_TRUE@@HALD_COMPILE_LINUX_TRUE@am__EXEEXT_1 = hald-addon-macbookpro-backlight$(EXEEXT)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald/linux/addons/addon-cpufreq.c new/hal-0.5.8_git20061103/hald/linux/addons/addon-cpufreq.c
--- old/hal-0.5.8_git20061027/hald/linux/addons/addon-cpufreq.c 2006-10-27 18:22:20.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald/linux/addons/addon-cpufreq.c 2006-11-03 14:15:29.000000000 +0100
@@ -815,7 +815,7 @@
gboolean out_is_allowed;
gboolean out_is_temporary;
LibPolKitResult res;
-
+
connection_new = dbus_bus_get(DBUS_BUS_SYSTEM, error);
if (dbus_error_is_set(error)) {
dbus_raise_error(connection, message, CPUFREQ_ERROR_GENERAL,
@@ -952,6 +952,19 @@
return TRUE;
}
+static DBusHandlerResult dbus_filter_function_local(DBusConnection *connection,
+ DBusMessage *message,
+ void *user_data)
+{
+ if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL,
+ "Disconnected")) {
+ HAL_DEBUG(("DBus daemon disconnected. Trying to reconnect..."));
+ dbus_connection_unref(connection);
+ g_timeout_add(5000, (GSourceFunc)dbus_init_local, NULL);
+ }
+ return DBUS_HANDLER_RESULT_HANDLED;
+}
+
/** dbus filter function
*
* @raises UnknownMethod
@@ -1043,13 +1056,6 @@
dbus_send_reply_strlist(connection, message, governors);
g_strfreev(governors);
- } else if (dbus_message_is_signal(message, DBUS_INTERFACE_LOCAL,
- "Disconnected")) {
- HAL_DEBUG(("DBus daemon disconnected. Trying to reconnect..."));
- dbus_connection_close(connection);
- dbus_connection_unref(connection);
- g_timeout_add(5000, (GSourceFunc)dbus_init, NULL);
-
} else {
return DBUS_HANDLER_RESULT_NOT_YET_HANDLED;
}
@@ -1071,6 +1077,26 @@
}
/** returns FALSE on success because it's used as a callback */
+gboolean dbus_init_local(void)
+{
+ DBusConnection *dbus_connection;
+ DBusError dbus_error;
+
+ dbus_error_init(&dbus_error);
+
+ dbus_connection = dbus_bus_get(DBUS_BUS_SYSTEM, &dbus_error);
+ if (dbus_error_is_set(&dbus_error)) {
+ HAL_WARNING(("Cannot get D-Bus connection"));
+ return TRUE;
+ }
+
+ dbus_connection_setup_with_g_main(dbus_connection, NULL);
+ dbus_connection_add_filter(dbus_connection, dbus_filter_function_local,
+ NULL, NULL);
+ dbus_connection_set_exit_on_disconnect(dbus_connection, 0);
+ return FALSE;
+}
+
gboolean dbus_init(void)
{
DBusError dbus_error;
@@ -1090,12 +1116,10 @@
goto Error;
}
- dbus_error_init (&dbus_error);
if (!libhal_device_addon_is_ready (halctx, udi, &dbus_error)) {
goto Error;
}
-
if (!libhal_device_claim_interface(halctx, udi,
"org.freedesktop.Hal.Device.CPUFreq",
" \n"
@@ -1137,11 +1161,11 @@
dbus_connection_setup_with_g_main(dbus_connection, NULL);
dbus_connection_add_filter(dbus_connection, dbus_filter_function, NULL, NULL);
dbus_connection_set_exit_on_disconnect(dbus_connection, 0);
- return FALSE;
+ return TRUE;
Error:
dbus_error_free(&dbus_error);
- return TRUE;
+ return FALSE;
}
/********************* DBus end *********************/
@@ -1179,7 +1203,7 @@
exit(EXIT_FAILURE);
}
- if (dbus_init())
+ if (!dbus_init() || dbus_init_local())
exit(EXIT_FAILURE);
gmain = g_main_loop_new(NULL, FALSE);
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald/linux/addons/addon-cpufreq.h new/hal-0.5.8_git20061103/hald/linux/addons/addon-cpufreq.h
--- old/hal-0.5.8_git20061027/hald/linux/addons/addon-cpufreq.h 2006-10-27 18:22:20.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald/linux/addons/addon-cpufreq.h 2006-11-03 14:15:29.000000000 +0100
@@ -69,4 +69,6 @@
gboolean dbus_init (void);
+gboolean dbus_init_local (void);
+
#endif /* ADDON_CPUFREQ_H */
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald/linux/probing/Makefile.in new/hal-0.5.8_git20061103/hald/linux/probing/Makefile.in
--- old/hal-0.5.8_git20061027/hald/linux/probing/Makefile.in 2006-10-27 19:03:36.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald/linux/probing/Makefile.in 2006-11-03 14:41:07.000000000 +0100
@@ -51,7 +51,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(libexecdir)"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald/solaris/Makefile.in new/hal-0.5.8_git20061103/hald/solaris/Makefile.in
--- old/hal-0.5.8_git20061027/hald/solaris/Makefile.in 2006-10-27 19:03:36.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald/solaris/Makefile.in 2006-11-03 14:41:07.000000000 +0100
@@ -43,7 +43,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald-runner/Makefile.in new/hal-0.5.8_git20061103/hald-runner/Makefile.in
--- old/hal-0.5.8_git20061027/hald-runner/Makefile.in 2006-10-27 19:03:35.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald-runner/Makefile.in 2006-11-03 14:41:06.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(libexecdir)"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/hald-runner/main.c new/hal-0.5.8_git20061103/hald-runner/main.c
--- old/hal-0.5.8_git20061027/hald-runner/main.c 2006-10-27 18:22:20.000000000 +0200
+++ new/hal-0.5.8_git20061103/hald-runner/main.c 2006-11-03 14:15:29.000000000 +0100
@@ -111,7 +111,7 @@
DBusMessage *reply;
DBusMessageIter iter;
run_request *r;
- GPid pid;
+ GPid pid __attribute__ ((aligned));
r = new_run_request();
g_assert(dbus_message_iter_init(msg, &iter));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/libhal/Makefile.in new/hal-0.5.8_git20061103/libhal/Makefile.in
--- old/hal-0.5.8_git20061027/libhal/Makefile.in 2006-10-27 19:03:37.000000000 +0200
+++ new/hal-0.5.8_git20061103/libhal/Makefile.in 2006-11-03 14:41:08.000000000 +0100
@@ -45,7 +45,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/libhal-storage/Makefile.in new/hal-0.5.8_git20061103/libhal-storage/Makefile.in
--- old/hal-0.5.8_git20061027/libhal-storage/Makefile.in 2006-10-27 19:03:37.000000000 +0200
+++ new/hal-0.5.8_git20061103/libhal-storage/Makefile.in 2006-11-03 14:41:08.000000000 +0100
@@ -45,7 +45,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/partutil/Makefile.in new/hal-0.5.8_git20061103/partutil/Makefile.in
--- old/hal-0.5.8_git20061027/partutil/Makefile.in 2006-10-27 19:03:37.000000000 +0200
+++ new/hal-0.5.8_git20061103/partutil/Makefile.in 2006-11-03 14:41:08.000000000 +0100
@@ -43,7 +43,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/partutil/partutil.c new/hal-0.5.8_git20061103/partutil/partutil.c
--- old/hal-0.5.8_git20061027/partutil/partutil.c 2006-10-27 18:22:20.000000000 +0200
+++ new/hal-0.5.8_git20061103/partutil/partutil.c 2006-11-03 14:15:29.000000000 +0100
@@ -491,7 +491,7 @@
part_table_parse_msdos (int fd, guint64 offset, guint64 size, gboolean *found_gpt)
{
int n;
- const guint8 mbr[512];
+ const guint8 mbr[512] __attribute__ ((aligned));
PartitionTable *p;
//HAL_INFO (("Entering MS-DOS parser"));
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/privileges/Makefile.in new/hal-0.5.8_git20061103/privileges/Makefile.in
--- old/hal-0.5.8_git20061027/privileges/Makefile.in 2006-10-27 19:03:37.000000000 +0200
+++ new/hal-0.5.8_git20061103/privileges/Makefile.in 2006-11-03 14:41:08.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
SOURCES =
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/tools/Makefile.in new/hal-0.5.8_git20061103/tools/Makefile.in
--- old/hal-0.5.8_git20061027/tools/Makefile.in 2006-10-27 19:03:37.000000000 +0200
+++ new/hal-0.5.8_git20061103/tools/Makefile.in 2006-11-03 14:41:09.000000000 +0100
@@ -55,7 +55,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(bindir)" "$(DESTDIR)$(libexecdir)" \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/tools/device-manager/Makefile.in new/hal-0.5.8_git20061103/tools/device-manager/Makefile.in
--- old/hal-0.5.8_git20061027/tools/device-manager/Makefile.in 2006-10-27 19:03:38.000000000 +0200
+++ new/hal-0.5.8_git20061103/tools/device-manager/Makefile.in 2006-11-03 14:41:09.000000000 +0100
@@ -47,7 +47,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES = hal-device-manager Const.py
am__installdirs = "$(DESTDIR)$(devicemanagerbindir)" \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/tools/freebsd/Makefile.in new/hal-0.5.8_git20061103/tools/freebsd/Makefile.in
--- old/hal-0.5.8_git20061027/tools/freebsd/Makefile.in 2006-10-27 19:03:38.000000000 +0200
+++ new/hal-0.5.8_git20061103/tools/freebsd/Makefile.in 2006-11-03 14:41:09.000000000 +0100
@@ -43,7 +43,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(scriptdir)"
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-0.5.8_git20061027/tools/linux/Makefile.in new/hal-0.5.8_git20061103/tools/linux/Makefile.in
--- old/hal-0.5.8_git20061027/tools/linux/Makefile.in 2006-10-27 19:03:38.000000000 +0200
+++ new/hal-0.5.8_git20061103/tools/linux/Makefile.in 2006-11-03 14:41:10.000000000 +0100
@@ -44,7 +44,7 @@
$(top_srcdir)/configure.in
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
-mkinstalldirs = $(install_sh) -d
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
am__installdirs = "$(DESTDIR)$(scriptdir)" "$(DESTDIR)$(udevrulesdir)"
++++++ hal-fix-path_eject_binary.diff ++++++
diff --git a/tools/hal-storage-shared.c b/tools/hal-storage-shared.c
index 0b95a35..7640e3b 100644
--- a/tools/hal-storage-shared.c
+++ b/tools/hal-storage-shared.c
@@ -483,7 +483,7 @@ #endif
g_free (mount_point_to_unmount);
}
-#define EJECT "/usr/bin/eject"
+#define EJECT "/bin/eject"
void
handle_eject (LibHalContext *hal_ctx,
++++++ hal-fix-wireless_detection_rt2500pci.diff ++++++
diff --git a/hald/linux/device.c b/hald/linux/device.c
index 9f1a86a..6c8c259 100644
--- a/hald/linux/device.c
+++ b/hald/linux/device.c
@@ -191,11 +191,16 @@ net_add (const gchar *sysfs_path, const
if (media_type == ARPHRD_ETHER) {
const char *addr;
char wireless_path[HAL_PATH_MAX];
+ char wiphy_path[HAL_PATH_MAX];
gboolean is_wireless;
struct stat s;
snprintf (wireless_path, HAL_PATH_MAX, "%s/wireless", sysfs_path);
- if (stat (wireless_path, &s) == 0 && (s.st_mode & S_IFDIR)) {
+ /* wireless dscape stack e.g. from rt2500pci driver*/
+ snprintf (wiphy_path, HAL_PATH_MAX, "%s/wiphy", sysfs_path);
+
+ if ((stat (wireless_path, &s) == 0 && (s.st_mode & S_IFDIR)) ||
+ (stat (wiphy_path, &s) == 0) && (s.st_mode & S_IFDIR)) {
hal_device_property_set_string (d, "info.product", "WLAN Interface");
hal_device_property_set_string (d, "info.category", "net.80211");
hal_device_add_capability (d, "net.80211");
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org