Mailinglist Archive: opensuse-commit (1426 mails)

< Previous Next >
commit hal
  • From: root@xxxxxxxxxxxxxxx (h_root)
  • Date: Tue, 27 Mar 2007 01:54:20 +0200
  • Message-id: <20070326235420.80BC667817D@xxxxxxxxxxxxxxx>

Hello community,

here is the log from the commit of package hal
checked in at Tue Mar 27 01:54:20 CEST 2007.

--------
--- hal/hal.changes     2007-03-24 14:34:55.000000000 +0100
+++ /mounts/work_src_done/STABLE/hal/hal.changes        2007-03-26 22:29:54.710565000 +0200
@@ -1,0 +2,16 @@
+Mon Mar 26 13:00:20 CEST 2007 - dkukawka@xxxxxxx
+
+- updated to actual HAL/hal-info git (== 0.5.9rc2)
+  - updated libsmbios dependencies
+  - cleaned up configure options
+- removed now upstream included patches: 
+  - hal-usb_speed_and_version_in_double.diff 
+  - hal-validate_error_name.diff
+  - hal-add-alsa_midi_devices.diff
+- updated patches:
+  - hal-add-tabletPC_support_v2.diff
+- added patches:
+  - hal-fix-configure-dell.diff: enable Dell backlight addon also 
+    for x86_64
+
+-------------------------------------------------------------------

Old:
----
  hal-0.5.8_git20070314.tar.bz2
  hal-add-alsa_midi_devices.diff
  hal-info-20070314.tar.bz2
  hal-usb_speed_and_version_in_double.diff
  hal-validate_error_name.diff

New:
----
  hal-0.5.8_git20070326.tar.bz2
  hal-fix-configure-dell.diff
  hal-info-20070326.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ hal.spec ++++++
--- /var/tmp/diff_new_pack.h16977/_old  2007-03-27 01:53:56.000000000 +0200
+++ /var/tmp/diff_new_pack.h16977/_new  2007-03-27 01:53:56.000000000 +0200
@@ -1,5 +1,5 @@
 #
-# spec file for package hal (Version 0.5.8_git20070314)
+# spec file for package hal (Version 0.5.8_git20070326)
 #
 # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
@@ -11,10 +11,10 @@
 # norootforbuild
 
 Name:           hal
+BuildRequires:  PolicyKit-devel dbus-1-glib-devel docbook-utils doxygen glib2-devel gtkdoc html-dtd intltool libusb libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files xmlto
 %ifarch %ix86 x86_64
-BuildRequires:  PolicyKit-devel dbus-1-glib-devel docbook-utils doxygen glib2-devel gtkdoc html-dtd intltool libsmbios libsmbios-devel libusb libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
-%else
-BuildRequires:  PolicyKit-devel dbus-1-glib-devel docbook-utils doxygen glib2-devel gtkdoc html-dtd intltool libusb libvolume_id-devel parted parted-devel pciutils pciutils-devel perl-XML-Parser popt-devel python-devel update-desktop-files
+BuildRequires:  libsmbios-libs >= 0.13.4
+BuildRequires:  libsmbios-devel >= 0.13.4
 %endif
 Requires:       pm-utils
 URL:            http://freedesktop.org/Software/hal
@@ -22,8 +22,8 @@
 %define dbus_release            1
 License:        Other uncritical OpenSource License
 Group:          System/Daemons
-Version:        0.5.8_git20070314
-Release:        6
+Version:        0.5.8_git20070326
+Release:        1
 Autoreqprov:    on
 Summary:        Daemon for Collecting Hardware Information
 # SUSE specific patches
@@ -41,27 +41,25 @@
 Patch101:       hal-fix-power-privileges.diff
 Patch102:       hal-pci.diff
 Patch103:       hal-add-IBMHotkey_Support_v2_incl_TabletPC.diff
-Patch104:       hal-usb_speed_and_version_in_double.diff 
-Patch105:       hal-add-cdrom_capabilities.diff
-Patch106:       hal-validate_error_name.diff
-Patch107:       hal-add-alsa_midi_devices.diff
-Patch108:       hal-add_soundcard_fix_device_file_handling.diff
-Patch109:       hal-cleanup_acpi-addon_DBusError_handling.diff
-Patch110:       hal-fix-hal_device_manager_about_dialog.diff
-Patch111:       hal-fix-eject_path.diff
+Patch104:       hal-add-cdrom_capabilities.diff
+Patch105:       hal-add_soundcard_fix_device_file_handling.diff
+Patch106:       hal-cleanup_acpi-addon_DBusError_handling.diff
+Patch107:       hal-fix-hal_device_manager_about_dialog.diff
+Patch108:       hal-fix-eject_path.diff
+Patch109:       hal-fix-configure-dell.diff
 #
 # need to backport 
 Patch400:       hal-performance_pci.ids_v5.diff
+#Patch300:       hal-temp.diff
 # Sources:
 Source0:        %{name}-%{version}.tar.bz2
-Source1:        hal-info-20070314.tar.bz2 
+Source1:        hal-info-20070326.tar.bz2 
 Source2:        rc.hal
 Source3:        90-hal.rules
 Prereq:         /usr/sbin/groupadd /usr/sbin/useradd /etc/init.d/boot.localfs
-%ifarch %ix86 x86_64 ia64
-Requires:       dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base, PolicyKit, pm-utils, pmtools, libsmbios-libs
-%else
 Requires:       dbus-1 >= %{dbus_version}-%{dbus_release}, dbus-1-glib >= %{dbus_version}-%{dbus_release}, aaa_base, PolicyKit, pm-utils 
+%ifarch %ix86 x86_64 ia64
+Requires:       pmtools, libsmbios-libs >= 0.13.4
 %endif
 Provides:       hotplugctl
 Obsoletes:      hotplugctl
@@ -154,7 +152,7 @@
 %patch12 -p1
 %patch100 -p1
 %patch101 -p1
-%patch102 -p0
+%patch102 -p1
 %patch103 -p1
 %patch104 -p1
 %patch105 -p1
@@ -162,8 +160,7 @@
 %patch107 -p1
 %patch108 -p1
 %patch109 -p1
-%patch110 -p1
-%patch111 -p1
+#%patch300 -p1
 popd
 #%patch400 -p1
 
@@ -182,14 +179,11 @@
        --datadir=%{_datadir}                           \
         --with-init-scripts=suse                       \
        --with-hwdata=/usr/share                        \
-       --enable-hotplug-map                            \
        --with-pid-file=/var/run/hal/haldaemon.pid      \
        --with-dbus-sys=/etc/dbus-1/system.d            \
        --with-hal-user=haldaemon                       \
        --with-hal-group=haldaemon                      \
        --with-doc-dir=%{_datadir}/doc/packages/hal     \
-       --enable-pcmcia-support                         \
-       --enable-sysfs-carrier                          \
        --enable-acpi-acpid                             \
        --disable-acpi-proc                             \
        --enable-gtk-doc                                \
@@ -295,6 +289,19 @@
 %{_bindir}/hal-device-manager
 
 %changelog
+* Mon Mar 26 2007 - dkukawka@xxxxxxx
+- updated to actual HAL/hal-info git (== 0.5.9rc2)
+  - updated libsmbios dependencies
+  - cleaned up configure options
+- removed now upstream included patches:
+  - hal-usb_speed_and_version_in_double.diff
+  - hal-validate_error_name.diff
+  - hal-add-alsa_midi_devices.diff
+- updated patches:
+  - hal-add-tabletPC_support_v2.diff
+- added patches:
+  - hal-fix-configure-dell.diff: enable Dell backlight addon also
+  for x86_64
 * Sat Mar 24 2007 - schwab@xxxxxxx
 - Fix quoting.
 * Sat Mar 24 2007 - aj@xxxxxxx


++++++ hal-0.5.8_git20070314.tar.bz2 -> hal-0.5.8_git20070326.tar.bz2 ++++++
++++ 16031 lines of diff (skipped)

++++++ hal-add-tabletPC_support_v2.diff ++++++
--- /var/tmp/diff_new_pack.h16977/_old  2007-03-27 01:53:58.000000000 +0200
+++ /var/tmp/diff_new_pack.h16977/_new  2007-03-27 01:53:58.000000000 +0200
@@ -128,16 +128,14 @@
 index 4909974..f7f9986 100644
 --- a/tools/Makefile.am
 +++ b/tools/Makefile.am
-@@ -55,7 +55,8 @@ libexec_PROGRAMS =                          \
-       hal-storage-eject                   \
+@@ -56,6 +56,7 @@
        hal-storage-closetray               \
        hal-storage-cleanup-mountpoint      \
--      hal-storage-cleanup-all-mountpoints
-+      hal-storage-cleanup-all-mountpoints \
-+      hal-system-setserial
+       hal-storage-cleanup-all-mountpoints \
++      hal-system-setserial                \
+       hal-system-power-pm-is-supported
  
  if HAVE_PMU
- libexec_PROGRAMS +=                       \
 @@ -94,6 +95,9 @@ hal_storage_cleanup_mountpoint_LDADD = @GLIB_LIBS@ @POLKIT_LIBS@ @DBUS_LIBS@ $(t
  hal_storage_cleanup_all_mountpoints_SOURCES = hal-storage-cleanup-all-mountpoints.c hal-storage-shared.c hal-storage-shared.h
  hal_storage_cleanup_all_mountpoints_LDADD = @GLIB_LIBS@ @POLKIT_LIBS@ @DBUS_LIBS@ $(top_builddir)/libhal/libhal.la $(top_builddir)/libhal-storage/libhal-storage.la

++++++ hal-fix-configure-dell.diff ++++++
diff --git a/configure.in b/configure.in
index e046f48..9cfce94 100644
--- a/configure.in
+++ b/configure.in
@@ -763,7 +763,7 @@ elif test "x$with_dell_backlight" = "x" ; then
     case "${HALD_BACKEND}" in
       linux)
         case "${host}" in
-         i[[3456]]86-*-*)
+         i*86-*-*|x86_64-*-*)
             BUILD_DELL=yes
            ;;
          *)
@@ -777,30 +777,6 @@ elif test "x$with_dell_backlight" = "x" ; then
 fi
 AM_CONDITIONAL(BUILD_DELL, test x$BUILD_DELL = xyes)
 
-dnl Dell RF KILL
-AC_ARG_WITH(dell-rfkill,        [  --with-dell-rfkill      Whether to build Dell RF-kill support (auto)])
-BUILD_DELL_RFKILL=no
-if test "x$with_dell_rfkill" = "xyes" ; then
-   BUILD_DELL=yes
-elif test "x$with_dell_rfkill" = "x" ; then
-  if test "$USE_SMBIOS" = "yes" ; then
-    case "${HALD_BACKEND}" in
-      linux)
-        case "${host}" in
-         i[[3456]]86-*-*)
-            BUILD_DELL_RFKILL=yes
-           ;;
-         *)
-           ;;
-       esac
-        ;;
-      *)
-        ;;
-    esac
-   fi
-fi
-AM_CONDITIONAL(BUILD_DELL_RFKILL, test x$BUILD_DELL_RFKILL = xyes)
-
 dnl Sony PIC support
 AC_ARG_ENABLE(sonypic,
                AC_HELP_STRING([--enable-sonypic],[Build with Sony PIC support]),
@@ -937,7 +913,6 @@ echo "
         CPU frequency scaling:      ${BUILD_CPUFREQ} (Linux only)
        USB wireless mouse power:   ${BUILD_USBCSR} (Linux only, requires libusb)
        Dell Backlight:             ${BUILD_DELL} (Linux only, requires libsmbios >= 0.13.4)
-       Dell RF Kill:               ${BUILD_DELL_RFKILL} (Linux only, requires libsmbios >= 0.13.4)
 
         Maintainer mode:            ${USE_MAINTAINER_MODE}
         Building verbose mode:      ${enable_verbose_mode}
++++++ hal-info-20070314.tar.bz2 -> hal-info-20070326.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/acinclude.m4 new/hal-info-20070326/acinclude.m4
--- old/hal-info-20070314/acinclude.m4  2007-03-14 19:27:40.000000000 +0100
+++ new/hal-info-20070326/acinclude.m4  2007-03-26 12:53:44.000000000 +0200
@@ -1,97 +0,0 @@
-
-dnl as-ac-expand.m4 0.1.0
-dnl autostars m4 macro for expanding directories using configure's prefix
-dnl thomas@xxxxxxxxxxxxx 
-
-dnl AS_AC_EXPAND(VAR, CONFIGURE_VAR)
-dnl
-dnl example
-dnl AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-dnl will set SYSCONFDIR to /usr/local/etc if prefix=/usr/local
-
-AC_DEFUN([AS_AC_EXPAND],
-[
-  EXP_VAR=[$1]
-  FROM_VAR=[$2]
-
-  dnl first expand prefix and exec_prefix if necessary
-  prefix_save=$prefix
-  exec_prefix_save=$exec_prefix
-
-  dnl if no prefix given, then use /usr/local, the default prefix
-  if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-  fi
-  dnl if no exec_prefix given, then use prefix
-  if test "x$exec_prefix" = "xNONE"; then
-    exec_prefix=$prefix
-  fi
-
-  full_var="$FROM_VAR"
-  dnl loop until it doesn't change anymore
-  while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var"="x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-  dnl clean up
-  full_var=$new_full_var
-  AC_SUBST([$1], "$full_var")
-
-  dnl restore prefix and exec_prefix
-  prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-])
-
-dnl GTK_DOC_CHECK borrowed from cairo, thanks!
-
-dnl Usage:
-dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
-AC_DEFUN([GTK_DOC_CHECK],
-[
-  AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
-  AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
-  dnl for overriding the documentation installation directory
-  AC_ARG_WITH(html-dir,
-    AC_HELP_STRING([--with-html-dir=PATH], [path to installed docs]),,
-    [with_html_dir='${datadir}/gtk-doc/html'])
-  HTML_DIR="$with_html_dir"
-  AC_SUBST(HTML_DIR)
-
-  dnl enable/disable documentation building
-  AC_ARG_ENABLE(gtk-doc,
-    AC_HELP_STRING([--enable-gtk-doc],
-                   [use gtk-doc to build documentation [default=yes]]),,
-    enable_gtk_doc=yes)
-
-  have_gtk_doc=no
-  if test x$enable_gtk_doc = xyes; then
-    if test -z "$PKG_CONFIG"; then
-      AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-    fi
-    if test "$PKG_CONFIG" != "no" && $PKG_CONFIG --exists gtk-doc; then
-      have_gtk_doc=yes
-    fi
-
-  dnl do we want to do a version check?
-ifelse([$1],[],,
-    [gtk_doc_min_version=$1
-    if test "$have_gtk_doc" = yes; then
-      AC_MSG_CHECKING([gtk-doc version >= $gtk_doc_min_version])
-      if $PKG_CONFIG --atleast-version $gtk_doc_min_version gtk-doc; then
-        AC_MSG_RESULT(yes)
-      else
-        AC_MSG_RESULT(no)
-        have_gtk_doc=no
-      fi
-    fi
-])
-    if test "$have_gtk_doc" != yes; then
-      enable_gtk_doc=no
-    fi
-  fi
-
-  AM_CONDITIONAL(ENABLE_GTK_DOC, test x$enable_gtk_doc = xyes)
-  AM_CONDITIONAL(GTK_DOC_USE_LIBTOOL, test -n "$LIBTOOL")
-])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/ChangeLog new/hal-info-20070326/ChangeLog
--- old/hal-info-20070314/ChangeLog     2007-03-14 19:29:23.000000000 +0100
+++ new/hal-info-20070326/ChangeLog     2007-03-26 12:54:43.000000000 +0200
@@ -1,3 +1,133 @@
+commit b1ba285086ed84e8861f1047e6bc629b9b964f76
+Author: David Zeuthen <davidz@xxxxxxxxxx>
+Date:   Mon Mar 26 00:50:06 2007 -0400
+
+    fix up COPYING to avoid mentioning source files etc.
+
+ COPYING |    9 ++-------
+ 1 files changed, 2 insertions(+), 7 deletions(-)
+
+commit a4a6417472dc3421ea110293dca85b691f3ce7b4
+Author: David Zeuthen <davidz@xxxxxxxxxx>
+Date:   Mon Mar 26 00:48:32 2007 -0400
+
+    update version to 20060326
+
+ configure.in |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+commit a6a5f1bee756bd686418778ba06f987e2d918370
+Author: David Zeuthen <davidz@xxxxxxxxxx>
+Date:   Fri Mar 23 20:00:33 2007 -0400
+
+    add support for Dell RF kill switches
+
+ .../10freedesktop/10-dell-rfkill-switch.fdi        |   37
+ ++++++++++++++++++++
+ .../10freedesktop/10-sony-bluetooth-switch.fdi     |    4 +-
+ fdi/information/10freedesktop/Makefile.am          |    4 ++-
+ 3 files changed, 42 insertions(+), 3 deletions(-)
+
+commit 58917de0ae967c0fb7c52513521090de18599c24
+Author: Andreas Hanke <andreas.hanke@xxxxxxxxxxxxxx>
+Date:   Thu Mar 22 17:27:23 2007 -0400
+
+    really fix path expansion in hal-info
+
+    this patch for hal-info really fixes configure path expansion in
+    hal-info by simply removing it, because it plain and simple doesn't
+    work. A ./configure invocation without arguments and with autoconf >=
+    2.60 currently prints the following:
+
+                        hal-info 20070313
+                      ========================
+
+            prefix:                     /usr/local
+            datadir:                    ${prefix}/share
+            sysconfdir:                 /usr/local/etc
+            hardware recall data:       yes
+            video suspend data:         yes
+
+    As you can easily see, sysconfdir is expanded, but datadir is not.
+    That's because AS_AC_EXPAND messes around with autoconf internals that
+    have changed in autoconf 2.60.
+
+    It pretends to expand things, but doesn't actually do it. The
+    proper fix
+    for that is to stop messing around with autoconf internals,
+    i.e. to not
+    use AS_AC_EXPAND any more.
+
+    With the attached patch, configure prints all variables unexpanded and
+    as derived from each other, which is the truth. With autoconf 2.60 it
+    looks like this:
+
+                        hal-info 20070313
+                      ========================
+
+            prefix:                     /usr/local
+            datarootdir:                ${prefix}/share
+            datadir:                    ${datarootdir}
+            sysconfdir:                 ${prefix}/etc
+            hardware recall data:       yes
+            video suspend data:         yes
+
+    With autoconf 2.59 it looks a little different because it does
+    not have
+    datarootdir yet:
+
+                        hal-info 20070313
+                      ========================
+
+            prefix:                     /usr/local
+            datarootdir:                unused
+            datadir:                    ${prefix}/share
+            sysconfdir:                 ${prefix}/etc
+            hardware recall data:       yes
+            video suspend data:         yes
+
+    There is no need to worry about unexpanded variables in output files
+    because hal-info does not have any. It has only Makefiles as output
+    files and in Makefiles, variables don't need to be expanded. In fact
+    they must not be expanded because that would prevent users from
+    redefining them while running make. This is the reason why stock
+    autoconf without AS_AC_EXPAND-style hacks does not offer any way to
+    expand them. If it had any output files where variables have to be
+    expanded, dedicated make rules would have to be written for them. See:
+
+    http://www.gnu.org/software/autoconf/manual/html_node/Installation-Directory-Variables.html#Installation-Directory-Variables
+    http://www.gnu.org/software/autoconf/manual/html_node/Defining-Directories.html
+
+    Other than the hal patch I submitted via bugzilla some time ago, which
+    was just a sample that somehow went in, this one is a distcheck tested
+    patch that can be applied as-is. It also removes two incorrect and
+    superfluous AC_SUBST usages as well as the GTK_DOC_CHECK which
+    hal-info
+    never actually used at all.
+
+    hal itself needs more changes to entirely get rid of AS_AC_EXPAND and
+    comply with autotools coding rules. The good news is that in *most*
+    places it already does the right thing, but not everywhere. I can work
+    on a patch for that as well, if desired.
+
+ acinclude.m4 |   97
+ ----------------------------------------------------------
+ configure.in |   13 ++------
+ 2 files changed, 3 insertions(+), 107 deletions(-)
+
+commit 5964f3f626d746fa832b65437423b75c315f29c5
+Author: Danny Kukawka <danny.kukawka@xxxxxx>
+Date:   Thu Mar 15 12:16:53 2007 +0100
+
+    removed folder information fro YP-U1
+
+    Removed portable_audio_player.audio_folders property for the
+    Samsung YP-U1
+    to fix fd.o bug #10297
+
+ .../10freedesktop/10-usb-music-players.fdi         |    1 -
+ 1 files changed, 0 insertions(+), 1 deletions(-)
+
 commit 828c748d4c920a40e1a591d8a9061bfa15d5cb9b
 Merge: f49e80c... 98b3497...
 Author: David Zeuthen <davidz@xxxxxxxxxx>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/configure new/hal-info-20070326/configure
--- old/hal-info-20070314/configure     2007-03-14 19:28:57.000000000 +0100
+++ new/hal-info-20070326/configure     2007-03-26 12:54:24.000000000 +0200
@@ -1,8 +1,8 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59 for hal-info 20070314.
+# Generated by GNU Autoconf 2.59 for hal-info 20070326.
 #
-# Report bugs to <dkukawka@xxxxxxx>.
+# Report bugs to <david@xxxxxxxx>.
 #
 # Copyright (C) 2003 Free Software Foundation, Inc.
 # This configure script is free software; the Free Software Foundation
@@ -269,11 +269,11 @@
 # Identity of this package.
 PACKAGE_NAME='hal-info'
 PACKAGE_TARNAME='hal-info'
-PACKAGE_VERSION='20070314'
-PACKAGE_STRING='hal-info 20070314'
-PACKAGE_BUGREPORT='dkukawka@xxxxxxx'
+PACKAGE_VERSION='20070326'
+PACKAGE_STRING='hal-info 20070326'
+PACKAGE_BUGREPORT='david@xxxxxxxx'
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S BUILD_RECALL_TRUE BUILD_RECALL_FALSE BUILD_RECALL BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE BUILD_VIDEO SYSCONFDIR DATADIR LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE LN_S BUILD_RECALL_TRUE BUILD_RECALL_FALSE BUILD_VIDEO_TRUE BUILD_VIDEO_FALSE LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -738,7 +738,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-info 20070314 to adapt to many kinds of systems.
+\`configure' configures hal-info 20070326 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -800,7 +800,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of hal-info 20070314:";;
+     short | recursive ) echo "Configuration of hal-info 20070326:";;
    esac
   cat <<\_ACEOF
 
@@ -823,7 +823,7 @@
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <dkukawka@xxxxxxx>.
+Report bugs to <david@xxxxxxxx>.
 _ACEOF
 fi
 
@@ -919,7 +919,7 @@
 test -n "$ac_init_help" && exit 0
 if $ac_init_version; then
   cat <<\_ACEOF
-hal-info configure 20070314
+hal-info configure 20070326
 generated by GNU Autoconf 2.59
 
 Copyright (C) 2003 Free Software Foundation, Inc.
@@ -933,7 +933,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-info $as_me 20070314, which was
+It was created by hal-info $as_me 20070326, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   $ $0 $@
@@ -1576,7 +1576,7 @@
 
 # Define the identity of the package.
  PACKAGE=hal-info
- VERSION=20070314
+ VERSION=20070326
 
 
 cat >>confdefs.h <<_ACEOF
@@ -2842,8 +2842,6 @@
   BUILD_RECALL_FALSE=
 fi
 
-BUILD_RECALL=$enable_recall
-
 
 # Check whether --enable-video or --disable-video was given.
 if test "${enable_video+set}" = set; then
@@ -2862,65 +2860,6 @@
   BUILD_VIDEO_FALSE=
 fi
 
-BUILD_VIDEO=$enable_video
-
-
-
-  EXP_VAR=SYSCONFDIR
-  FROM_VAR=$sysconfdir
-
-    prefix_save=$prefix
-  exec_prefix_save=$exec_prefix
-
-    if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-  fi
-    if test "x$exec_prefix" = "xNONE"; then
-    exec_prefix=$prefix
-  fi
-
-  full_var="$FROM_VAR"
-    while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var"="x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-    full_var=$new_full_var
-  SYSCONFDIR="$full_var"
-
-
-    prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-
-
-  EXP_VAR=DATADIR
-  FROM_VAR=$datadir
-
-    prefix_save=$prefix
-  exec_prefix_save=$exec_prefix
-
-    if test "x$prefix" = "xNONE"; then
-    prefix=$ac_default_prefix
-  fi
-    if test "x$exec_prefix" = "xNONE"; then
-    exec_prefix=$prefix
-  fi
-
-  full_var="$FROM_VAR"
-    while true; do
-    new_full_var="`eval echo $full_var`"
-    if test "x$new_full_var"="x$full_var"; then break; fi
-    full_var=$new_full_var
-  done
-
-    full_var=$new_full_var
-  DATADIR="$full_var"
-
-
-    prefix=$prefix_save
-  exec_prefix=$exec_prefix_save
-
 
                                                                                                     ac_config_files="$ac_config_files Makefile fdi/Makefile fdi/information/Makefile fdi/information/10freedesktop/Makefile fdi/information/20thirdparty/Makefile fdi/information/30user/Makefile fdi/preprobe/Makefile fdi/preprobe/10freedesktop/Makefile fdi/preprobe/20thirdparty/Makefile fdi/preprobe/30user/Makefile"
 cat >confcache <<\_ACEOF
@@ -3313,7 +3252,7 @@
 } >&5
 cat >&5 <<_CSEOF
 
-This file was extended by hal-info $as_me 20070314, which was
+This file was extended by hal-info $as_me 20070326, which was
 generated by GNU Autoconf 2.59.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -3376,7 +3315,7 @@
 
 cat >>$CONFIG_STATUS <<_ACEOF
 ac_cs_version="\\
-hal-info config.status 20070314
+hal-info config.status 20070326
 configured by $0, generated by GNU Autoconf 2.59,
   with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
 
@@ -3624,12 +3563,8 @@
 s,@LN_S@,$LN_S,;t t
 s,@BUILD_RECALL_TRUE@,$BUILD_RECALL_TRUE,;t t
 s,@BUILD_RECALL_FALSE@,$BUILD_RECALL_FALSE,;t t
-s,@BUILD_RECALL@,$BUILD_RECALL,;t t
 s,@BUILD_VIDEO_TRUE@,$BUILD_VIDEO_TRUE,;t t
 s,@BUILD_VIDEO_FALSE@,$BUILD_VIDEO_FALSE,;t t
-s,@BUILD_VIDEO@,$BUILD_VIDEO,;t t
-s,@SYSCONFDIR@,$SYSCONFDIR,;t t
-s,@DATADIR@,$DATADIR,;t t
 s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
@@ -4353,8 +4288,9 @@
                   ========================
 
         prefix:                     ${prefix}
-        datadir:                    ${DATADIR}
-        sysconfdir:                 ${SYSCONFDIR}
+        datarootdir:                ${datarootdir:-unused}
+        datadir:                    ${datadir}
+        sysconfdir:                 ${sysconfdir}
         hardware recall data:       ${enable_recall}
         video suspend data:         ${enable_video}
 "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/configure.in new/hal-info-20070326/configure.in
--- old/hal-info-20070314/configure.in  2007-03-14 19:28:33.000000000 +0100
+++ new/hal-info-20070326/configure.in  2007-03-26 12:53:44.000000000 +0200
@@ -1,6 +1,6 @@
 AC_PREREQ(2.57)
 
-AC_INIT(hal-info, 20070314, dkukawka@xxxxxxx)
+AC_INIT(hal-info, 20070326, david@xxxxxxxx)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AM_CONFIG_HEADER(config.h)
 
@@ -12,20 +12,12 @@
 dnl ---------------------------------------------------------------------------
 AC_ARG_ENABLE(recall, [  --enable-recall         include recall data],enable_recall=$enableval,enable_recall=yes)
 AM_CONDITIONAL(BUILD_RECALL, test x$enable_recall == xyes)
-AC_SUBST(BUILD_RECALL, $enable_recall)
 
 dnl ---------------------------------------------------------------------------
 dnl - Should we ship the video suspend data
 dnl ---------------------------------------------------------------------------
 AC_ARG_ENABLE(video, [  --enable-video          include video suspend data],enable_video=$enableval,enable_video=yes)
 AM_CONDITIONAL(BUILD_VIDEO, test x$enable_video == xyes)
-AC_SUBST(BUILD_VIDEO, $enable_video)
-
-dnl ---------------------------------------------------------------------------
-dnl - Make paths available for source files
-dnl ---------------------------------------------------------------------------
-AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
-AS_AC_EXPAND(DATADIR, $datadir)
 
 AC_OUTPUT([
 Makefile
@@ -46,8 +38,9 @@
                   ========================
 
         prefix:                     ${prefix}
-        datadir:                    ${DATADIR}
-        sysconfdir:                 ${SYSCONFDIR}
+        datarootdir:                ${datarootdir:-unused}
+        datadir:                    ${datadir}
+        sysconfdir:                 ${sysconfdir}
         hardware recall data:       ${enable_recall}
         video suspend data:         ${enable_video}
 "
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/COPYING new/hal-info-20070326/COPYING
--- old/hal-info-20070314/COPYING       2007-03-14 19:27:40.000000000 +0100
+++ new/hal-info-20070326/COPYING       2007-03-26 12:53:44.000000000 +0200
@@ -1,11 +1,6 @@
-HAL is licensed to you under your choice of the Academic Free
+hal-info is licensed to you under your choice of the Academic Free
 License version 2.1, or the GNU General Public License version 2.
-Both licenses are included here. Some individual source code files 
-and/or binaries may be under the GPL only or under the LGPG.
-
-Each source code file is marked with the proper copyright information.
-
-
+Both licenses are included here. 
 
 The Academic Free License
 v. 2.1
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/information/10freedesktop/10-dell-rfkill-switch.fdi new/hal-info-20070326/fdi/information/10freedesktop/10-dell-rfkill-switch.fdi
--- old/hal-info-20070314/fdi/information/10freedesktop/10-dell-rfkill-switch.fdi       1970-01-01 01:00:00.000000000 +0100
+++ new/hal-info-20070326/fdi/information/10freedesktop/10-dell-rfkill-switch.fdi       2007-03-26 12:53:44.000000000 +0200
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+  <device>
+    <match key="system.kernel.name" string="Linux"> 
+      <match key="system.hardware.vendor" string="Dell Inc.">
+        <match key="system.formfactor" string="laptop">
+         <!-- TODO: check if laptop actually sports an SMI interface -->
+          <spawn udi="/org/freedesktop/Hal/devices/dell_bluetooth_switch"/>
+          <spawn udi="/org/freedesktop/Hal/devices/dell_wlan_switch"/>
+        </match>
+      </match>
+    </match>
+  </device>
+
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/dell_bluetooth_switch">
+      <append key="info.capabilities" type="strlist">killswitch</append>
+      <merge key="info.category" type="string">killswitch</merge>
+      <merge key="info.product" type="string">Dell Bluetooth Switch</merge>
+      <merge key="killswitch.type" type="string">bluetooth</merge>
+      <merge key="killswitch.access_method" type="string">dell</merge>
+    </match>
+  </device>
+
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/dell_wlan_switch">
+      <append key="info.capabilities" type="strlist">killswitch</append>
+      <merge key="info.product" type="string">Dell WLAN Switch</merge>
+      <merge key="info.category" type="string">killswitch</merge>
+      <merge key="killswitch.type" type="string">wlan</merge>
+      <merge key="killswitch.access_method" type="string">dell</merge>
+    </match>
+  </device>
+
+</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi new/hal-info-20070326/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi
--- old/hal-info-20070314/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi    1970-01-01 01:00:00.000000000 +0100
+++ new/hal-info-20070326/fdi/information/10freedesktop/10-sony-bluetooth-switch.fdi    2007-03-26 12:53:44.000000000 +0200
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deviceinfo version="0.2">
+
+  <device>
+    <match key="system.kernel.name" string="Linux"> 
+      <match key="system.hardware.vendor" string="Sony Corporation">
+        <match key="system.formfactor" string="laptop">
+         <match key="system.product" contains="VGN-S1XP">
+            <spawn udi="/org/freedesktop/Hal/devices/sonypic_bluetooth_switch"/>
+         </match>
+         <!-- FIXME add more laptops here -->
+        </match>
+      </match>
+    </match>
+  </device>
+
+  <device>
+    <match key="info.udi" string="/org/freedesktop/Hal/devices/sonypic_bluetooth_switch">
+      <append key="info.capabilities" type="strlist">killswitch</append>
+      <merge key="info.category" type="string">killswitch</merge>
+      <merge key="info.product" type="string">Sony Bluetooth Switch</merge>
+      <merge key="killswitch.type" type="string">bluetooth</merge>
+      <merge key="killswitch.access_method" type="string">sonypic</merge>
+
+      <match key="@info.parent:system.product" contains="VGN-S1XP">
+        <merge key="killswitch.expected_usb_vendor_id" type="int">0x44e</merge>
+        <merge key="killswitch.expected_usb_product_id" type="int">0x3007</merge>
+      </match>
+
+      <!-- FIXME add more laptops here -->
+    </match>
+  </device>
+
+</deviceinfo>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/information/10freedesktop/10-usb-music-players.fdi new/hal-info-20070326/fdi/information/10freedesktop/10-usb-music-players.fdi
--- old/hal-info-20070314/fdi/information/10freedesktop/10-usb-music-players.fdi        2007-03-14 19:27:40.000000000 +0100
+++ new/hal-info-20070326/fdi/information/10freedesktop/10-usb-music-players.fdi        2007-03-26 12:53:44.000000000 +0200
@@ -204,7 +204,6 @@
             <append key="portable_audio_player.output_formats" type="strlist">application/ogg</append>
             <append key="portable_audio_player.output_formats" type="strlist">audio/x-wav</append>
             <append key="portable_audio_player.input_formats" type="strlist">audio/x-wav</append>
-           <append key="portable_audio_player.audio_folders" type="strlist">MUSIC/</append>
           </match>  
           <!-- Samsung YP-Z5 -->
           <match key="@storage.originating_device:usb.product_id" int="0x5041">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/information/10freedesktop/Makefile.am new/hal-info-20070326/fdi/information/10freedesktop/Makefile.am
--- old/hal-info-20070314/fdi/information/10freedesktop/Makefile.am     2007-03-14 19:27:40.000000000 +0100
+++ new/hal-info-20070326/fdi/information/10freedesktop/Makefile.am     2007-03-26 12:53:44.000000000 +0200
@@ -8,7 +8,9 @@
                10-usb-pda.fdi                  \
                10-usbcsr-mice.fdi              \
                10-laptop-panel-hardware.fdi    \
-               10-cd-dvd-burner.fdi
+               10-cd-dvd-burner.fdi            \
+               10-sony-bluetooth-switch.fdi    \
+               10-dell-rfkill-switch.fdi
 
 if BUILD_RECALL
 dist_fdi_DATA +=                               \
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/information/10freedesktop/Makefile.in new/hal-info-20070326/fdi/information/10freedesktop/Makefile.in
--- old/hal-info-20070314/fdi/information/10freedesktop/Makefile.in     2007-03-14 19:28:56.000000000 +0100
+++ new/hal-info-20070326/fdi/information/10freedesktop/Makefile.in     2007-03-26 12:54:22.000000000 +0200
@@ -72,6 +72,7 @@
        10-usb-music-players.fdi 10-usb-zip-drives.fdi \
        10-camera-ptp.fdi 10-usb-pda.fdi 10-usbcsr-mice.fdi \
        10-laptop-panel-hardware.fdi 10-cd-dvd-burner.fdi \
+       10-sony-bluetooth-switch.fdi 10-dell-rfkill-switch.fdi \
        10-recall-battery-dell.fdi 10-recall-battery-ibm.fdi \
        10-recall-battery-lenovo.fdi 10-recall-battery-fujitsu.fdi \
        10-recall-battery-gateway.fdi 10-recall-battery-toshiba.fdi \
@@ -99,10 +100,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_RECALL = @BUILD_RECALL@
 BUILD_RECALL_FALSE = @BUILD_RECALL_FALSE@
 BUILD_RECALL_TRUE = @BUILD_RECALL_TRUE@
-BUILD_VIDEO = @BUILD_VIDEO@
 BUILD_VIDEO_FALSE = @BUILD_VIDEO_FALSE@
 BUILD_VIDEO_TRUE = @BUILD_VIDEO_TRUE@
 CC = @CC@
@@ -110,7 +109,6 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -138,7 +136,6 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
@@ -173,7 +170,8 @@
 dist_fdi_DATA = 10-usb-card-readers.fdi 10-usb-music-players.fdi \
        10-usb-zip-drives.fdi 10-camera-ptp.fdi 10-usb-pda.fdi \
        10-usbcsr-mice.fdi 10-laptop-panel-hardware.fdi \
-       10-cd-dvd-burner.fdi $(am__append_1) $(am__append_2)
+       10-cd-dvd-burner.fdi 10-sony-bluetooth-switch.fdi \
+       10-dell-rfkill-switch.fdi $(am__append_1) $(am__append_2)
 all: all-am
 
 .SUFFIXES:
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/information/20thirdparty/Makefile.in new/hal-info-20070326/fdi/information/20thirdparty/Makefile.in
--- old/hal-info-20070314/fdi/information/20thirdparty/Makefile.in      2007-03-14 19:28:56.000000000 +0100
+++ new/hal-info-20070326/fdi/information/20thirdparty/Makefile.in      2007-03-26 12:54:22.000000000 +0200
@@ -65,10 +65,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_RECALL = @BUILD_RECALL@
 BUILD_RECALL_FALSE = @BUILD_RECALL_FALSE@
 BUILD_RECALL_TRUE = @BUILD_RECALL_TRUE@
-BUILD_VIDEO = @BUILD_VIDEO@
 BUILD_VIDEO_FALSE = @BUILD_VIDEO_FALSE@
 BUILD_VIDEO_TRUE = @BUILD_VIDEO_TRUE@
 CC = @CC@
@@ -76,7 +74,6 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -104,7 +101,6 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/information/30user/Makefile.in new/hal-info-20070326/fdi/information/30user/Makefile.in
--- old/hal-info-20070314/fdi/information/30user/Makefile.in    2007-03-14 19:28:56.000000000 +0100
+++ new/hal-info-20070326/fdi/information/30user/Makefile.in    2007-03-26 12:54:22.000000000 +0200
@@ -65,10 +65,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_RECALL = @BUILD_RECALL@
 BUILD_RECALL_FALSE = @BUILD_RECALL_FALSE@
 BUILD_RECALL_TRUE = @BUILD_RECALL_TRUE@
-BUILD_VIDEO = @BUILD_VIDEO@
 BUILD_VIDEO_FALSE = @BUILD_VIDEO_FALSE@
 BUILD_VIDEO_TRUE = @BUILD_VIDEO_TRUE@
 CC = @CC@
@@ -76,7 +74,6 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -104,7 +101,6 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/information/Makefile.in new/hal-info-20070326/fdi/information/Makefile.in
--- old/hal-info-20070314/fdi/information/Makefile.in   2007-03-14 19:28:56.000000000 +0100
+++ new/hal-info-20070326/fdi/information/Makefile.in   2007-03-26 12:54:22.000000000 +0200
@@ -63,10 +63,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_RECALL = @BUILD_RECALL@
 BUILD_RECALL_FALSE = @BUILD_RECALL_FALSE@
 BUILD_RECALL_TRUE = @BUILD_RECALL_TRUE@
-BUILD_VIDEO = @BUILD_VIDEO@
 BUILD_VIDEO_FALSE = @BUILD_VIDEO_FALSE@
 BUILD_VIDEO_TRUE = @BUILD_VIDEO_TRUE@
 CC = @CC@
@@ -74,7 +72,6 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -102,7 +99,6 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/Makefile.in new/hal-info-20070326/fdi/Makefile.in
--- old/hal-info-20070314/fdi/Makefile.in       2007-03-14 19:28:56.000000000 +0100
+++ new/hal-info-20070326/fdi/Makefile.in       2007-03-26 12:54:22.000000000 +0200
@@ -63,10 +63,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_RECALL = @BUILD_RECALL@
 BUILD_RECALL_FALSE = @BUILD_RECALL_FALSE@
 BUILD_RECALL_TRUE = @BUILD_RECALL_TRUE@
-BUILD_VIDEO = @BUILD_VIDEO@
 BUILD_VIDEO_FALSE = @BUILD_VIDEO_FALSE@
 BUILD_VIDEO_TRUE = @BUILD_VIDEO_TRUE@
 CC = @CC@
@@ -74,7 +72,6 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -102,7 +99,6 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/preprobe/10freedesktop/Makefile.in new/hal-info-20070326/fdi/preprobe/10freedesktop/Makefile.in
--- old/hal-info-20070314/fdi/preprobe/10freedesktop/Makefile.in        2007-03-14 19:28:56.000000000 +0100
+++ new/hal-info-20070326/fdi/preprobe/10freedesktop/Makefile.in        2007-03-26 12:54:22.000000000 +0200
@@ -65,10 +65,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_RECALL = @BUILD_RECALL@
 BUILD_RECALL_FALSE = @BUILD_RECALL_FALSE@
 BUILD_RECALL_TRUE = @BUILD_RECALL_TRUE@
-BUILD_VIDEO = @BUILD_VIDEO@
 BUILD_VIDEO_FALSE = @BUILD_VIDEO_FALSE@
 BUILD_VIDEO_TRUE = @BUILD_VIDEO_TRUE@
 CC = @CC@
@@ -76,7 +74,6 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -104,7 +101,6 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/preprobe/20thirdparty/Makefile.in new/hal-info-20070326/fdi/preprobe/20thirdparty/Makefile.in
--- old/hal-info-20070314/fdi/preprobe/20thirdparty/Makefile.in 2007-03-14 19:28:57.000000000 +0100
+++ new/hal-info-20070326/fdi/preprobe/20thirdparty/Makefile.in 2007-03-26 12:54:23.000000000 +0200
@@ -65,10 +65,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_RECALL = @BUILD_RECALL@
 BUILD_RECALL_FALSE = @BUILD_RECALL_FALSE@
 BUILD_RECALL_TRUE = @BUILD_RECALL_TRUE@
-BUILD_VIDEO = @BUILD_VIDEO@
 BUILD_VIDEO_FALSE = @BUILD_VIDEO_FALSE@
 BUILD_VIDEO_TRUE = @BUILD_VIDEO_TRUE@
 CC = @CC@
@@ -76,7 +74,6 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -104,7 +101,6 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/preprobe/30user/Makefile.in new/hal-info-20070326/fdi/preprobe/30user/Makefile.in
--- old/hal-info-20070314/fdi/preprobe/30user/Makefile.in       2007-03-14 19:28:57.000000000 +0100
+++ new/hal-info-20070326/fdi/preprobe/30user/Makefile.in       2007-03-26 12:54:23.000000000 +0200
@@ -65,10 +65,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_RECALL = @BUILD_RECALL@
 BUILD_RECALL_FALSE = @BUILD_RECALL_FALSE@
 BUILD_RECALL_TRUE = @BUILD_RECALL_TRUE@
-BUILD_VIDEO = @BUILD_VIDEO@
 BUILD_VIDEO_FALSE = @BUILD_VIDEO_FALSE@
 BUILD_VIDEO_TRUE = @BUILD_VIDEO_TRUE@
 CC = @CC@
@@ -76,7 +74,6 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -104,7 +101,6 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/fdi/preprobe/Makefile.in new/hal-info-20070326/fdi/preprobe/Makefile.in
--- old/hal-info-20070314/fdi/preprobe/Makefile.in      2007-03-14 19:28:57.000000000 +0100
+++ new/hal-info-20070326/fdi/preprobe/Makefile.in      2007-03-26 12:54:23.000000000 +0200
@@ -63,10 +63,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_RECALL = @BUILD_RECALL@
 BUILD_RECALL_FALSE = @BUILD_RECALL_FALSE@
 BUILD_RECALL_TRUE = @BUILD_RECALL_TRUE@
-BUILD_VIDEO = @BUILD_VIDEO@
 BUILD_VIDEO_FALSE = @BUILD_VIDEO_FALSE@
 BUILD_VIDEO_TRUE = @BUILD_VIDEO_TRUE@
 CC = @CC@
@@ -74,7 +72,6 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -102,7 +99,6 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/hal-info-20070314/Makefile.in new/hal-info-20070326/Makefile.in
--- old/hal-info-20070314/Makefile.in   2007-03-14 19:28:57.000000000 +0100
+++ new/hal-info-20070326/Makefile.in   2007-03-26 12:54:23.000000000 +0200
@@ -78,10 +78,8 @@
 AUTOHEADER = @AUTOHEADER@
 AUTOMAKE = @AUTOMAKE@
 AWK = @AWK@
-BUILD_RECALL = @BUILD_RECALL@
 BUILD_RECALL_FALSE = @BUILD_RECALL_FALSE@
 BUILD_RECALL_TRUE = @BUILD_RECALL_TRUE@
-BUILD_VIDEO = @BUILD_VIDEO@
 BUILD_VIDEO_FALSE = @BUILD_VIDEO_FALSE@
 BUILD_VIDEO_TRUE = @BUILD_VIDEO_TRUE@
 CC = @CC@
@@ -89,7 +87,6 @@
 CFLAGS = @CFLAGS@
 CPPFLAGS = @CPPFLAGS@
 CYGPATH_W = @CYGPATH_W@
-DATADIR = @DATADIR@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
 ECHO_C = @ECHO_C@
@@ -117,7 +114,6 @@
 SET_MAKE = @SET_MAKE@
 SHELL = @SHELL@
 STRIP = @STRIP@
-SYSCONFDIR = @SYSCONFDIR@
 VERSION = @VERSION@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_STRIP = @ac_ct_STRIP@

++++++ hal-pci.diff ++++++
--- /var/tmp/diff_new_pack.h16977/_old  2007-03-27 01:53:59.000000000 +0200
+++ /var/tmp/diff_new_pack.h16977/_new  2007-03-27 01:53:59.000000000 +0200
@@ -1,6 +1,43 @@
---- hald/linux/addons/Makefile.am
-+++ hald/linux/addons/Makefile.am
-@@ -20,7 +20,7 @@
+diff --git a/configure.in b/configure.in
+index e046f48..bfa8206 100644
+--- a/configure.in
++++ b/configure.in
+@@ -344,22 +344,14 @@ AC_ARG_WITH([libpci],
+   [],
+   [with_libpci=yes])

+-AS_IF([test "x$with_libpci" != xno],
+-  [dnl Check for libpci
+-   AC_CHECK_HEADERS([pci/pci.h], [
+-     AC_CHECK_LIB(pci, pci_init, [
+-       USE_LIBPCI=yes; AM_CONDITIONAL(HAVE_LIBPCI, true)], [
+-       USE_LIBPCI=no; AM_CONDITIONAL(HAVE_LIBPCI, false)])], [
+-     USE_LIBPCI=no; AM_CONDITIONAL(HAVE_LIBPCI, false)])
+-  ], [
+-    USE_LIBPCI=no; AM_CONDITIONAL(HAVE_LIBPCI, false)
+-  ])
+-
+-AC_ARG_WITH(backend, [  --with-backend=<name>   backend to use (linux/solaris/freebsd/dummy)],
+-                      [
+-                      backend=$withval
+-                      ]
+-                      )
++USE_LIBPCI="no"
++if test "x$with_libpci" != xno ; then
++  dnl check for libpci
++  AC_CHECK_HEADERS([pci/pci.h], [AC_CHECK_LIB([pci], [pci_init], [USE_LIBPCI="yes"], , [-lz ]) ])
++fi 
++AM_CONDITIONAL([HAVE_LIBPCI], [test "x$USE_LIBPCI" = "xyes"])
++
++AC_ARG_WITH(backend, [  --with-backend=<name>   backend to use (linux/solaris/freebsd/dummy)], [ backend=$withval ])
+ if ! test -z "$with_backend" ; then
+     HALD_BACKEND="$with_backend"
+ else
+diff --git a/hald/linux/addons/Makefile.am b/hald/linux/addons/Makefile.am
+index 5d98709..ffd4ea1 100644
+--- a/hald/linux/addons/Makefile.am
++++ b/hald/linux/addons/Makefile.am
+@@ -35,13 +35,13 @@ endif
  if BUILD_MACBOOKPRO
  libexec_PROGRAMS += hald-addon-macbookpro-backlight
  hald_addon_macbookpro_backlight_SOURCES = addon-macbookpro-backlight.c ../../logger.c
@@ -8,15 +45,11 @@
 +hald_addon_macbookpro_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lpci -lz @GLIB_LIBS@
  endif
  
- if BUILD_CPUFREQ
---- hald/linux/addons/Makefile.in
-+++ hald/linux/addons/Makefile.in
-@@ -374,7 +374,7 @@
-         @GLIB_CFLAGS@ @DBUS_CFLAGS@

- @BUILD_MACBOOKPRO_TRUE@@HALD_COMPILE_LINUX_TRUE@hald_addon_macbookpro_backlight_SOURCES = addon-macbookpro-backlight.c ../../logger.c
--@BUILD_MACBOOKPRO_TRUE@@HALD_COMPILE_LINUX_TRUE@hald_addon_macbookpro_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lpci @GLIB_LIBS@
-+@BUILD_MACBOOKPRO_TRUE@@HALD_COMPILE_LINUX_TRUE@hald_addon_macbookpro_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lpci -lz @GLIB_LIBS@
- @BUILD_CPUFREQ_TRUE@@HALD_COMPILE_LINUX_TRUE@hald_addon_cpufreq_SOURCES = addon-cpufreq.c addon-cpufreq.h addon-cpufreq-userspace.h \
- @BUILD_CPUFREQ_TRUE@@HALD_COMPILE_LINUX_TRUE@                      addon-cpufreq-userspace.c ../../logger.c
+ if BUILD_MACBOOK
+ libexec_PROGRAMS += hald-addon-macbook-backlight
+ hald_addon_macbook_backlight_SOURCES = addon-macbook-backlight.c ../../logger.c ../../util_helper.c
+-hald_addon_macbook_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lpci @GLIB_LIBS@
++hald_addon_macbook_backlight_LDADD = $(top_builddir)/libhal/libhal.la -lpci -lz @GLIB_LIBS@
+ endif
  
+ if BUILD_CPUFREQ



++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx

< Previous Next >