--- hal-0.5.10.orig/debian/control +++ hal-0.5.10/debian/control @@ -0,0 +1,103 @@ +Source: hal +Section: admin +Priority: optional +Maintainer: Ubuntu Core Developers +XSBC-Original-Maintainer: Sjoerd Simons +Uploaders: Sebastian Dröge , Michael Biebl +Build-Depends: debhelper (>= 5.0.37.2), cdbs, autotools-dev, libdbus-glib-1-dev (>= 0.61), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils-dev, doxygen, intltool (>= 0.22), libusb-dev [!hurd-i386], libvolume-id-dev, xmlto, libxml2-utils, gtk-doc-tools, libsmbios-dev [i386 amd64], gperf, libpolkit-dev (>= 0.5) +Standards-Version: 3.7.2 +XS-Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/hal/ubuntu +Homepage: http://hal.freedesktop.org/ + +Package: hal +Architecture: any +Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.065), dbus (>= 0.61), lsb-base, hal-info (>= 20070402), pm-utils, mount (>= 2.13), policykit, consolekit +Recommends: eject, libsmbios-bin [i386 amd64] +Suggests: gnome-device-manager +Description: Hardware Abstraction Layer + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + +Package: hal-doc +Architecture: all +Section: doc +Suggests: devhelp +Description: Hardware Abstraction Layer - documentation + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + . + This package contains the API documentation for HAL. + +Package: libhal1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: Hardware Abstraction Layer - shared library + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + . + This package contains shared libraries to be used by applications. + +Package: libhal-storage1 +Section: libs +Architecture: any +Depends: ${shlibs:Depends} +Description: Hardware Abstraction Layer - shared library for storage devices + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + . + This library provides an interface for handling storage devices. + +Package: libhal-dev +Section: libdevel +Architecture: any +Depends: libhal1 (= ${binary:Version}), libdbus-1-dev (>= 0.60) +Suggests: hal-doc +Description: Hardware Abstraction Layer - development files + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + . + This package contains files that are needed to build applications. + +Package: libhal-storage-dev +Section: libdevel +Architecture: any +Depends: libhal-storage1 (= ${binary:Version}), libdbus-1-dev (>= 0.60), libhal-dev +Suggests: hal-doc +Description: Hardware Abstraction Layer - development files + HAL provides an abstract view on hardware. + . + This abstraction layer is simply an interface that makes it possible to + add support for new devices and new ways of connecting devices to the + computer, without modifying every application that uses the device. + It maintains a list of devices that currently exist, and can provide + information about those upon request. + . + This package contains files that are needed to build applications that use + libhal-storage1. + --- hal-0.5.10.orig/debian/hal.preinst +++ hal-0.5.10/debian/hal.preinst @@ -0,0 +1,76 @@ +#!/bin/sh + +set -e + +rm_conffile() { + PKGNAME="hal" + CONFFILE="$1" + + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +mv_conffile() { + OLD="$1" + NEW="$2" + if [ -e "$OLD" ]; then + md5sum="`md5sum \"$OLD\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg -s dhcdbd | sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $OLD'{s/.* //;p}}\"`" + if [ "$md5sum" = "$old_md5sum" ]; then + mv -f "$OLD" "$OLD.moved-by-preinst" + else + mv -f "$OLD" "$NEW" + fi + fi +} + + +case "$1" in + install|upgrade) + if dpkg --compare-versions "$2" le "0.5.2-1"; then + rm_conffile "/etc/hal/fdi/preferences.fdi" + rm_conffile "/etc/dev.d/block/hal-unmount.dev" + fi + if dpkg --compare-versions "$2" le "0.5.6-2"; then + rm_conffile "/etc/udev/scripts/device-removable.sh" + fi + if dpkg --compare-versions "$2" le "0.5.6-4"; then + rm_conffile "/etc/hal/fdi/preferences.fdi" + fi + if dpkg --compare-versions "$2" le "0.5.7-2"; then + rm_conffile "/etc/udev/rules.d/90-hal.rules" + fi + if dpkg --compare-versions "$2" le "0.5.7.1-1"; then + deluser --quiet --system hal > /dev/null || true + fi + if dpkg --compare-versions "$2" le "0.5.8.1-3ubuntu7"; then + mv_conffile /etc/udev/rules.d/85-hal.rules /etc/udev/rules.d/95-hal.rules + fi + if dpkg --compare-versions "$2" lt "0.5.9-3"; then + if [ -x /etc/dbus-1/event.d/20hal ]; then + /etc/dbus-1/event.d/20hal stop + fi + rm_conffile "/etc/dbus-1/event.d/20hal" + fi + # clean up doc directory symlinking from Gutsy + if dpkg --compare-versions "$2" lt-nl 0.5.10; then + for p in hal libhal-dev libhal-storage1 libhal-storage-dev; do + f=/usr/share/doc/$p + [ -e "$f" ] && rm -f $f || true + done + fi +esac + +#DEBHELPER# + +exit 0 --- hal-0.5.10.orig/debian/hal.default +++ hal-0.5.10/debian/hal.default @@ -0,0 +1 @@ +DAEMON_OPTS= --- hal-0.5.10.orig/debian/libhal-storage1.install +++ hal-0.5.10/debian/libhal-storage1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libhal-storage.so.* --- hal-0.5.10.orig/debian/rules +++ hal-0.5.10/debian/rules @@ -0,0 +1,38 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk + +ifneq ($(findstring $(DEB_BUILD_ARCH), i386 amd64),) +MACBOOK_SUPPORT = --with-macbookpro --with-macbook +endif + +DEB_CONFIGURE_EXTRA_FLAGS := --enable-hotplug-map \ + --with-pid-file=/var/run/hal/hald.pid \ + --enable-pcmcia-support \ + --with-hwdata=/usr/share/misc \ + $(MACBOOK_SUPPORT) \ + --enable-policy-kit \ + --enable-console-kit \ + --enable-umount-helper \ + --enable-docbook-docs \ + --docdir=/usr/share/doc/hal-doc + +DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 1 . + +common-install-impl:: + # Remove hal's default udev rules files.. We ship our own + rm -rf $(DEB_DESTDIR)/etc/udev + + install -m 644 -D debian/hal.udev.rules \ + $(DEB_DESTDIR)/etc/udev/rules.d/95-hal.rules + +install/hal:: + # Remove executable bit as this is nothing that can be executed + chmod -x $(DEB_DESTDIR)/usr/lib/hal/scripts/hal-functions + # Don't install 10-x11-input.fdi until xorg input hotplugging is fixed to + # properly support non-US keyboard layouts (see also: #442316). + rm -f $(DEB_DESTDIR)/usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi + --- hal-0.5.10.orig/debian/watch +++ hal-0.5.10/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://hal.freedesktop.org/releases/hal-([\d\.]+)\.tar\.gz --- hal-0.5.10.orig/debian/shlibs.local +++ hal-0.5.10/debian/shlibs.local @@ -0,0 +1 @@ +libhal 1 libhal1 (>= 0.5) --- hal-0.5.10.orig/debian/changelog +++ hal-0.5.10/debian/changelog @@ -0,0 +1,1576 @@ +hal (0.5.10-5~ubuntu3) hardy; urgency=low + + * debian/postinst: Drop chown'ing of /var/run/hal/, it does not exist on + fresh installations yet. Unconditionally chown the directory in the init + script instead. (LP: #175525) + + -- Martin Pitt Wed, 12 Dec 2007 09:55:46 +0100 + +hal (0.5.10-5~ubuntu2) hardy; urgency=low + + * Re-add accidentally dropped pciutils-dev build dependency. + + -- Martin Pitt Tue, 11 Dec 2007 09:36:59 +0100 + +hal (0.5.10-5~ubuntu1) hardy; urgency=low + + * Merge to Debian svn head to collect some bug fixes. See 0.5.10-1ubuntu1 + for remaining changes. + * debian/hal.postinst: Do not fail if haldaemon user or system groups + already exist. Debian removed these check recently, but it does not seem + to work for Ubuntu, or under all conditions. + + -- Martin Pitt Mon, 10 Dec 2007 17:06:20 +0100 + +hal (0.5.10-5) UNRELEASED; urgency=low + + [ Michael Biebl ] + * debian/hal.postinst + - Remove superfluous getent calls. adduser is clever enough to omit + creating accounts if they already exist. + - Don't ignore addgroup errors. + + [ Sjoerd Simons ] + * debian/patches/86_fix_killswitch_callout.patch: + - Added. Fixes errors from the killswitch callouts on non-dell machines + (Closes: #453203) + * debian/control: Don't build-depend on libusb-dev on hurd-i386 + * debian/patches/87_fix_hurd_compilation.patch: + - Added. Fix compilation on the Hurd. Based on a patch by Samuel Thibault + (Closes: #444574) + + -- Michael Biebl Mon, 03 Dec 2007 00:27:14 +0100 + +hal (0.5.10-4) unstable; urgency=low + + * debian/patches/85_fix_strlist_to_string.patch: + - Added. Fix strlist to string conversion to no longer use a static + buffer. As a side-effect fix an issue of strings not being properly + terminated on overflow. Which would cause garbage being sent over dbus + to the runner, causing it to exit (Closes: #445861, #447860) + + -- Sjoerd Simons Sun, 02 Dec 2007 22:40:30 +0100 + +hal (0.5.10-3) unstable; urgency=low + + * debian/patches/75_glist_memleak.patch + - Added. Fixes some memleaks by not probably freeing GSList object (from + upstream git) + * debian/patches/80_fix_int_outof.patch + - Added. Fixes int_outof match target in fdi files (from upstream git) + * debian/patches/70_killswitch_dell.patch + - Replaced by the version as applied to upstream git. + * debian/patches/81_dont_deref_reason_why_locked_if_null.patch + - Added. If dbus_malloc0 failed (returned NULL), don't deref the NULL + pointer. (from upstream git) + * debian/patches/82_partutil_dont_deref_null.patch + - Added. Fixes partutils to not deref a pointer before checking it's not + NULL (from upstream git) + * debian/patches/83_crash_if_singleton_hashtable_is_null.patch + - Added. Fixes crash when the singleton hashable isn't initialized (from + upstream git) + * debian/patches/84_fix_uninitialised_memory_usage_in_pci_add.patch + - Added. Properly initialise various field in pci_add. (From Rob Taylor) + + -- Sjoerd Simons Sun, 25 Nov 2007 13:24:59 +0100 + +hal (0.5.10-2ubuntu3) hardy; urgency=low + + * debian/hal.postinst: + - do not hal force-reload on upgrades from dapper (otherwise dbus + breaks badly) + + -- Michael Vogt Tue, 04 Dec 2007 13:41:27 +0100 + +hal (0.5.10-2ubuntu2) hardy; urgency=low + + * Merge Debian's experimental version to enable PolicyKit. + + -- Martin Pitt Tue, 20 Nov 2007 12:56:05 +0100 + +hal (0.5.10-2exp1) experimental; urgency=low + + * Enable the ConsoleKit/PolicyKit support in hal. Upload to experimental to + give this feature some wider testing. + * debian/control + - Add a Build-Depends on libpolkit-dev (>= 0.5). + - Add a Depends on policykit and consolekit to the hal package. + - The Vcs-* fields are now officially supported, so remove the XS- prefix. + - Change maintainer address to pkg-utopia-maintainers@l.a.d.o. + - Add sjoerd, slomo and myself to Uploaders. + * debian/rules + - Add --enable-console-kit and --enable-policy-kit to + DEB_CONFIGURE_EXTRA_FLAGS. + * debian/hal.install + - Install the hal-is-caller-privileged binary. + - Install the policy files in /usr/share/PolicyKit/. + * debian/hal.manpages + - Install the man page for hal-is-caller-privileged. + * debian/patches/55_nonpolkit-mount-policy.patch + - Removed. Patch has become obsolete as we use PolicyKit now. + * debian/patches/41_no_policy_validate.patch + - Don't fail during configure if polkit-policy-file-validate is not found. + This avoids an unnecessary build dependency on policykit. + + -- Michael Biebl Mon, 05 Nov 2007 10:36:25 +0100 + +hal (0.5.10-2ubuntu1) hardy; urgency=low + + * Merge with Debian unstable to get the X.org input hotplug reversion for + the time being. + * *.preinst: On upgrades from Gutsy, remove the symlinks to entire + /usr/share/doc// directories which got introduced in Gutsy. They + break upgrades all over, and current cdbs just symlinks individual files. + + -- Martin Pitt Wed, 31 Oct 2007 10:46:49 -0400 + +hal (0.5.10-2) unstable; urgency=low + + * debian/rules + - Remove /usr/share/hal/fdi/policy/10osvendor/10-x11-input.fdi which + effectively disables xorg input hotplugging again + (Closes: #447666, #447676, #447841). + This is only a temporary workaround until xserver-xorg has been fixed + to provide a clean upgrade path for non-US keyboard layouts. + * debian/hal.examples + - Install 10-x11-input.fdi under /usr/share/doc/hal/examples/ for the time + being. + * debian/patches/71_realpath.patch + - Include stdlib.h in tools/hal-disable-polling.c for the realpath + function prototype definition (Closes: #447657). + Patch by dann frazier, thanks. + + -- Michael Biebl Wed, 24 Oct 2007 15:38:34 +0200 + +hal (0.5.10-1ubuntu1) hardy; urgency=low + + * Redo the bzr branch of this package as clean fork from the Debian svn + (https://code.launchpad.net/~ubuntu-core-dev/hal/debian, thanks bzr-svn!) + and commit the remaining relevant Ubuntu patches to it: + https://code.launchpad.net/~ubuntu-core-dev/hal/ubuntu + * Merge with Debian unstable; remaining Ubuntu changes: + - Ubuntu udev world order: + + debian/hal.links: Remove rules symlink, we install the rules file + directly into rules/. + + debian/rules: Install udev rules into /etc/udev/rules.d/. + + debian/hal.{preinst,postinst,postrm}: Transition code for changing the + udev rule priority (see 0.5.8.1-3ubuntu7, needs to be kept until after + next LTS). + - debian/rules: Enable MacBook (Pro) support on i386 and amd64. Add + pciutils-dev build dependency. + - debian/hal.init: Remove stray gparted-disable-automount.fdi on startup. + (LP #134712) + - debian/rules: Do not run stop init.d script for levels 1 and 6 + (TearDown). + - debian/preferences.fdi: Disable automounting for fixed disks. On session + startup it is not done anyway (since that disables the gnome-mount UI + which would ask for authentication) and it leads to confusion when + restarting hal while a session is running. (LP #138537) + - 80_allow_vfat_usefree.patch: Allow vfat mount option "usefree". + (LP #133567) + - 81_ignore_single_slash_label.patch: Ignore labels which only consist of a + slash, so that they do not end up as /media/-. An earlier Ubuntu + d-i/ubiquity created those labels by default. (LP #83323) + - 82_ignore_fixed_nonmedia.patch: Ignore fixed partitions which mounted, + but not below /media/. + - 83_ssb_bus_support.patch: Add support for devices on the SSB bus; patch + by Matthew Garrett (not applied upstream yet, this needs to update the + spec, too). + - 84_memstick_bus_support.patch: Add support for devices on the "memstick" + bus; patch by Matthew Garrett (not reported upstream yet, this needs to + update the spec, too). + - 85_read_brightness_not_actual_brightness.patch: Read the brightness from + /sys/class/backlight/foo/brightness, not actual_brightness. It makes more + sense to change based on the brightness that we wanted to set, not the + brightness that we actually set. Patch by Matthew Garrett. Forwarded to + FD#12891. + * Now build with libsmbios to get Dell backlight support. (LP: #43572) + * Dropped the following Ubuntu changes: + - hwdb icons and patches, python-launchpad-integration, .desktop file + translation fixes: hal-device-manager is gone, will be replaced by + indepentent gnome-device-manager project. + - symlinking of doc directories in debian/rules: current cdbs does that + automatically now. + - 02_powerscripts.patch, 90_pmi.patch: pm-utils is the only supported + backend now. + - 26-addon-acpi-fix-free-before-init.diff, + 63_my_dbus_is_full_of_uints.patch, 69_set_dmi_before_matching.patch, + macbook-backlight.diff: Applied upstream. + - 56_probe_fstab.patch and the disabling of mounting for unmounted + partitions which are 'auto' in fstab: The patch does not fit into hal's + design to always show current information, was rejected upstream, + only handles a corner case, and we do not automount fixed drives anyway. + * Add 86_allow_ufs_ufstype.patch: Allow ufs mount option 'ufstype', thanks + to Georges Discry. (LP: #110865, FD#10998) + + -- Martin Pitt Tue, 23 Oct 2007 12:33:58 +0200 + +hal (0.5.10-1) unstable; urgency=low + + [ Michael Biebl ] + * New upstream release. + - Ships the x11-input.fdi file which is required for the xorg input + hotplugging (Closes: #446851). + - Correctly initializes the dbus error struct in the acpi addon + (Closes: #438802). + + hal-device-manager has been removed from the upstream tarball. There is + now a separate project called gnome-device-manager which is intended to + replace hal-device-manager. + * Remove obsolete files + - debian/hal-device-manager.1 + - debian/hal-device-manager.desktop + - debian/hal-device-manager.install + - debian/hal-device-manager.manpages + - debian/patches/62_dbus-python-0.80.patch + - debian/pyversions + * debian/rules + - Remove the dh_pysupport call. + - Enable the hal umount helper. + * debian/control + - Remove Build-Depends: python, python-dbus, python-support. + - Remove binary package hal-device-manager. + - Replace Suggests: hal-device-manager with gnome-device-manager. + - Use the new "Homepage:" field to specify the upstream URL. + - Add a Build-Depends: gperf. This utility is required for building the + hal-setup-keymap binary that is necessary for the multimedia key + re-mapping support. + - Add a Recommends: libsmbios-bin [i386 amd64]. The libsmbios-bin + package ships the dellWirelessCtl utility which is required for the + RF kill switch support on DELL laptops. + - Add a Depends: pm-utils. Beginning with this release we will only + support pm-utils as suspend infrastructure. + - Add a versioned Depends on mount (>= 2.13). This is a requirement of the + hal umount helper. + * debian/libhal1.shlibs, debian/libhal-storage1.shlibs + - Bump shlibs to >= 0.5.10 due to ABI additions. + * debian/hal.install + - Install the hal-setup-keymap binary. + - Install the hal umount helper to /usr/sbin as it has dependencies on + libraries in /usr/lib. + * debian/hal.links + - Create a symlink from /usr/sbin/umount.hal to /sbin. + * debian/watch + - Update to new download location at http://hal.freedesktop.org/releases/. + * Remove patches that were merged upstream + - debian/patches/68-pass-noquirks-to-pm-utils.patch + - debian/patches/70-libhal-changeset-memleak.patch + - debian/patches/75-hal-serial-null.patch + * debian/patches/70_killswitch_dell.patch + - Fix the path for the dellWirelessCtl utility (Closes: #443583). + * debian/patches/02_powerscripts.patch, + debian/patches/14_power_suspend_linux_pmu_fix.patch + - As we only support pm-utils, these patches have become obsolete and are + thus removed. + * debian/patches/55_nonpolkit-mount-policy.patch + - Rework patch for this hal version. Throw a Volume.PermissionDenied error + if a non-removable device is mounted by a user other than root. + + [ Sebastian Dröge ] + * debian/patches/68_alternative-cdrw-capacity-detection.patch + - Add an alternative method of detecting the capacity of CDR/CDRW discs. + Only using the old method fails for some drives, for more information + see http://bugs.freedesktop.org/show_bug.cgi?id=12822 . + * debian/rules: + - Don't mark /usr/lib/hal/scripts/hal-functions executable, this is + nothing that can be executed. + + -- Michael Biebl Mon, 22 Oct 2007 14:42:59 +0200 + +hal (0.5.9.1-6) unstable; urgency=low + + * debian/hal.init: + + Don't start hal if sysfs is not mounted on /sys or a chrooted session + is detected. + + -- Sebastian Dröge Tue, 25 Sep 2007 15:46:11 +0200 + +hal (0.5.9.1-5) unstable; urgency=low + + [ Sjoerd Simons ] + * debian/patches/75-hal-serial-null.patch: Fix crash when linux.device_file + of a serial device isn't known (Closes: #439919, #440468) + + -- Sjoerd Simons Sun, 23 Sep 2007 16:26:38 +0200 + +hal (0.5.9.1-4) unstable; urgency=low + + * debian/rules + - Do not explicitly enable the dell-backlight support as libsmbios-dev is + only available on amd64/i386. The ./configure script will automatically + enable the feature for platforms where libsmbios-dev is installed. + (Closes: #438459) + + -- Michael Biebl Fri, 17 Aug 2007 09:58:08 +0200 + +hal (0.5.9.1-3) unstable; urgency=low + + * Check for inotify support in the init script and fail gracefully with a + proper error message. (Closes: #426049, #434615) + * Check if dbus is running in the init script and fail gracefully with a + proper error message. (Closes: #426420, #427332) + * debian/hal-device-manager.desktop + - Remove invalid category "Application" from the Categories field. + + -- Michael Biebl Thu, 16 Aug 2007 09:57:24 +0200 + +hal (0.5.9.1-2) unstable; urgency=low + + [ Sjoerd Simons ] + * debian/control + + Add libsmbios-dev build-depend on amd64 and i386 to build the dell + backlight addon (Closes: #429871) + * debian/patches/70-libhal-changeset-memleak.patch + + Added. Fixes a memleak when freeing hal changesets. (Closes: #429823) + + [ Michael Biebl ] + * debian/hal.preinst + - Do not parse /var/lib/dpkg/status directly but use dpkg-query instead. + + -- Michael Biebl Fri, 22 Jun 2007 19:35:08 +0100 + +hal (0.5.9.1-1) unstable; urgency=low + + [ Sjoerd Simons ] + * debian/hal.udev.rules + + No longer try calling pumount or umount when devices are removed but not + unmounted. Leave this to hal itself + * debian/hal-unmount.sh + + Removed. No longer needed + + [ Tim Dijkstra ] + * Tell pm-utils if we know a machine doesn't need a quirk + + [ Michael Biebl ] + * New upstream release. + * Patches removed as they were merged upstream: + - debian/patches/10_repeated_property_changed_signals.patch + - debian/patches/11_fix_luks_mounting.patch + - debian/patches/12_powerscripts_quirks.patch + - debian/patches/16_ntfs_allowed_mount_options.patch + - debian/patches/66-NULL-fstype-crash.patch + - debian/patches/67-fix-probe-volume.patch + * debian/control + - Replace ${Source-Version} with ${binary:Version}. + - Add build dependency on autotools-dev for up-to-date config.{guess,sub} + files. + * debian/hal.init + - Don't fail to start if hal daemon is already running. + + -- Michael Biebl Tue, 19 Jun 2007 21:23:03 +0100 + +hal (0.5.9-3) unstable; urgency=low + + * Install the hal start script as regular SysV init script + (Closes: #407132, #397223) + - Rename debian/hal.init.dbus to debian/hal.init. + - Add proper LSB header to debian/hal.init and cleanup some cruft. + - debian/rules + + Don't install /etc/dbus-1/event.d/20hal anymore. + + Set DEB_DH_INSTALLINIT_ARGS to start at 24 and stop at 16. + - debian/hal.{preinst,postinst,prerm} + + The shell code to start/stop the hal daemon is now automatically + created by dh_installinit, so remove the manually written code. + hal.prerm is empty and therefore removed completely. + - debian/hal.preinst + + Remove the old conffile /etc/dbus-1/event.d/20hal or rename it to + *.dpkg-bak if it was modified locally. + + -- Michael Biebl Wed, 23 May 2007 12:33:08 +0200 + +hal (0.5.9-2) unstable; urgency=low + + [ Michael Biebl ] + * Upload to unstable. + + * Changes merged from Ubuntu: + - debian/patches/16_ntfs_allowed_mount_options.patch + + Allow NTFS mount option 'utf8' (LP #78142). + - debian/patches/62_dbus-python-0.80.patch + + Correctly show HAL properties in hal-device-manager with dbus-python. + (FD #9343; rejected upstream because h-d-m is going away). + - debian/patches/65-keyboard-addon-repeated.patch + + Do not ignore key repeat events in the keyboard addon. (FD #9767) + - debian/patches/66-NULL-fstype-crash.patch + + Do not crash on NULL volume.fstypes, and assing some fallback values + to them. (FD #10429, LP #87800) + - debian/patches/67-fix-probe-volume.patch + + Fix scrambled labels. (FD #10362, LP #69914) + - debian/hal.init.dbus + + Use actual init script path in usage help. + - debian/run-hald.sh + + Put absolute paths in HALD_RUNNER_PATH so that callouts are found, + too. + + * debian/control + - Drop Build-Depends: linux-kernel-headers (>= 2.6.17). + linux-libc-dev in unstable is recent enough. + - Drop Build-Depends: libcap-dev. It's only needed for compiling some of + the test programs. (Closes: #398933) + * debian/hal.postrm + - Reload dbus only on purge, i.e. when the conffile + /etc/dbus-1/system.d/hal.conf is removed. + - Remove the fdi-cache file on purge. + - Check for deluser being available. If not, print a warning message and + do not remove the haldaemon system account. (Closes: #416760) + * debian/hal.{preinst,postinst} + - Remove some old upgrade paths for the hal init script. + + [ Sjoerd Simons ] + * debian/libhal1.shlibs, debian/libhal-storage1.shlibs: Bump shlibs + + -- Michael Biebl Mon, 07 May 2007 15:41:16 +0200 + +hal (0.5.9-1) experimental; urgency=low + + * New upstream release. + - Fixes detection of wireless devices with dscape stack. (Closes: #399507) + - Adds support for fuse mounts. (Closes: #418570) + - Adds support for new sysfs layout of kernels > 2.6.20. (Closes: #410868) + * Patches removed as they were applied or fixed upstream: + - debian/patches/03_macbookpro_configure.patch + - debian/patches/04_cd_write.patch + - debian/patches/05_one_formfactor_fallback.patch + - debian/patches/06_smbios_return.patch + - debian/patches/07_ppc_suspend.patch + - debian/patches/08_openfirmware.patch + - debian/patches/09_check_hashtable_initialisation.patch + - debian/patches/10_callout_errors.patch + - debian/patches/11_no_useless_runner_errors.patch + - debian/patches/12_pegasus_pmu_crash_fix.patch + - debian/patches/13_hal_callout_bashism.patch + - debian/patches/15_partition_probing.patch + - debian/patches/24_dbus_connection_close.patch + - debian/patches/25_correctly_free_lists.patch + - debian/patches/26_fix_hald_not_running_coredump.patch + - debian/patches/27_hal_fix_dbus_error_is_set.patch + - debian/patches/29_handle_non_hal_mounts.patch + - debian/patches/30_cdrom_bogus_tocinfo.patch + * Revised patches: + - debian/patches/02_powerscripts.patch + - debian/patches/55_nonpolkit-mount-policy.patch + - debian/patches/14_power_suspend_linux_pmu_fix.patch + * debian/patches/19_sonypi_support.patch + - Removed. Instead of relying on the external spicctrl tool, /dev/sonypi + is used directly now by the hal-system-sonypic addon. + * Patches taken from upstream: + - debian/patches/10_repeated_property_changed_signals.patch + + Do not trigger the "device_property_changed" signal twice. + - debian/patches/11_fix_luks_mounting.patch + + Fix the lock checking for LUKS setup/teardown. + - debian/patches/12_powerscripts_quirks.patch + + Pass the correct quirks to pm-supend and pm-hibernate. + * debian/control + - Add Depends: hal-info (>= 20070402) to hal package. + - Change the Build-Depends: docbook-utils to xmlto which is now used for + building the API documentation. + * debian/libhal(-storage)-dev.install + - Do not install libtool *.la files anymore. + * debian/rules + - Remove cdbs tarball.mk rules file. + - Cleanup obsolete rm commands from common-install-impl. + * debian/hal.install + - Install the binaries hal-disable-polling, hal-is-caller-locked-out and + hal-lock. + * debian/hal.dirs + - Create the directories /var/cache/hald (fdi files cache) and + /var/lib/hal (dev acl management list). + * debian/hald.8, debian/lshal.1 + - Removed. Shipped upstream. + * debian/hal.manpages + - Install upstream manpages. (Closes: #277399) + + -- Michael Biebl Tue, 03 Apr 2007 09:31:47 +0200 + +hal (0.5.8.1-9) unstable; urgency=low + + * debian/no-cd-media-check.fdi + - Re-added "HL-DT-ST DVD-RW GCA-4080N" product string + + -- Sjoerd Simons Wed, 14 Mar 2007 21:31:28 +0100 + +hal (0.5.8.1-8) unstable; urgency=low + + [ Michael Biebl ] + * debian/control: + - Add an explicit build dependency on docbook-xml so we don't fail on + buildds without network access. + + [ Sjoerd Simons ] + * debian/hal-unmount.sh: Always run pumount/umount if a block device is + removed, not only when it's mounted. This ensure that dm devices can be + properly deconfigured by pumount. + * debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi + - Added. Ignore non-removable devices with crypto volumes again + (Closes: #414417) + + -- Sjoerd Simons Wed, 14 Mar 2007 20:36:26 +0100 + +hal (0.5.8.1-7) unstable; urgency=low + + [ Sjoerd Simons ] + * Acknowledge Steve Langasek's NMU. (Closes: #370186) + * debian/patches/29_handle_non_hal_mounts.patch + - Added. Handle volume removal for mounted volumed that weren't mounted by + hal correctly. + * debian/patches/30_cdrom_bogus_tocinfo.patch + - Added. Some cdrom drives/discs report a wrong start of the session in the + TOC, causing hal to not detect the filesystem. Work around this by + rescanning at offset 0 for discs when filesystem detection fails. + + [ Michael Biebl ] + * Add XS-Vcs-* fields to debian/control. + * Drop debian-storage-policy-fixed-drives.fdi in favor of + debian/patches/55_nonpolkit-mount-policy.patch. + This fixes the problem that local devices are not shown in nautilus. + (Closes: #394155, #395169, #409879) + * debian/patches/02_powerscripts.patch + - Add support for pm-utils and prefer it over other solutions. This is in + anticipation of hal-0.5.9, where pm-utils will be the preferred backend. + * Install HAL specification document. (Closes: #413813) + - debian/control: Build-Depend on docbook-utils and libxml2-utils. + - debian/rules: Pass --enable-docbook-docs to ./configure. + * debian/watch + - Fix regexp to not match non-hal releases, like hal-info. + + -- Sjoerd Simons Wed, 7 Mar 2007 23:50:11 +0100 + +hal (0.5.8.1-6.1) unstable; urgency=high + + * Non-maintainer upload. + * High-urgency upload for RC bugfix. + * Provide /usr/share/doc/hal/examples/no-cd-media-check.fdi as an example + for disabling CD ROM media checks, and document this in README.Debian, as + a workaround for CD drives with broken firmware. Closes: #370186. + + -- Steve Langasek Mon, 12 Feb 2007 16:42:29 -0800 + +hal (0.5.8.1-6) unstable; urgency=low + + * debian/patches/19_sonypi_support.patch + - Added. Fixes the sonypi brightness setting method + (Patch from Mike Hommey) (Closes: #391528) + + -- Sjoerd Simons Mon, 15 Jan 2007 22:53:09 +0100 + +hal (0.5.8.1-5) unstable; urgency=high + + [ Michael Biebl ] + * debian/hal-doc.install, debian/hal-doc.links + - Install API documentation into /usr/share/doc/hal-doc/html and create a + link back to /usr/share/gtk-doc/html/hal so devhelp can find it. + (Closes: #398803) + * debian/control + - Add a Suggests on devhelp for the hal-doc package which allows to + access the API documentation more easily. + + [ Sebastian Dröge ] + * debian/control: + + Updated to use my debian.org mail address + + [ Sjoerd Simons ] + * debian/patches/28_runner_64bit_values.patch + - Added. Ensure 64 bit values are correctly aligned before passing them to + dbus (Closes: #404937) + * Urgency high, fixes an RC bug + + -- Sjoerd Simons Mon, 15 Jan 2007 14:28:45 +0100 + +hal (0.5.8.1-4) unstable; urgency=low + + [ Michael Biebl ] + * Improve short description of the hal-doc package. (Closes: #387374) + + [ Sebastian Dröge ] + * Patches from upstream GIT: + + debian/patches/24_dbus_connection_close.patch: + - Don't call dbus_connection_close() in lshal and hal-device. This is + invalid usage of DBus API. + GIT changeset c85e02d58d6503b494bb4c8584a7c44ac6923208 + + debian/patches/25_correctly_free_lists.patch: + - Correctly free lists to prevent accessing free'd memory. + GIT changeset a56a15b90177734c70a8b03d961a7bcabdea2af8 + + debian/patches/26_fix_hald_not_running_coredump.patch: + - Don't coredump utilities when hald is not running but print a usefull + error message. GIT changeset c2053bf825cd9d81949d63ad83790a68310bb808 + + [ Sjoerd Simons ] + * debian/patches/02_powerscripts.patch + + Prefer hibernate over uswsusp. (Closes: #397302) + * debian/patches/27_hal_fix_dbus_error_is_set.patch + + Added. Ensure libhal never calls dbus_error_is_set(NULL) as that's not + allowed in the D-Bus API + + -- Sjoerd Simons Sat, 11 Nov 2006 14:16:52 +0100 + +hal (0.5.8.1-3) unstable; urgency=low + + * debian/control + - Add a Recommends on eject to the hal package. + - Add myself to Uploaders. + * 15_partition_probing.patch + - Added. Fixes problems with extended partition tables. + (Closes: #393245, #392978) + * Update to new python policy using python-support + - Tightened Build-Depends on python-support (>= 0.5.3). + - Drop X[SB]-P-V fields from debian/control, add a debian/pyversions file + instead specifying the supported python versions. + - Drop debian/pycompat. + - Drop dh_python call from debian/rules, call dh_pysupport with the + correct path to the modules directory. + - Call dh_pysupport in binary-install instead of binary-predeb. + + -- Michael Biebl Tue, 24 Oct 2006 13:33:55 +0200 + +hal (0.5.8.1-2) unstable; urgency=low + + * 12_pegasus_pmu_crash_fix.patch + - Added. Check if power_management.type was set before doing strcmp and + detect Pegasos machines as having the desktop formfactor + (Closes: #391124) + * /debian/patches/13_hal_callout_bashism.patch + - Added. Fix some bashisms in the hal callout scripts + * debian/patches/02_powerscripts.patch + - Updated. Use s2ram instead of s2both to let uswsusp suspend to ram + (Closes: #388558) + * debian/patches/14_power_suspend_linux_pmu_fix.patch + - Added. Use the correct hal property to check the powermanagement type. + (Closes: #393203) + + -- Sjoerd Simons Wed, 18 Oct 2006 23:45:26 +0200 + +hal (0.5.8.1-1) unstable; urgency=low + + * New upstream release + u debian/patches/01_hal_debian_dbuspolicy.patch + - Updated. + * debian/patches/05_pmu_nohibernate.patch + - Removed. Recent kernels don't crash my machine anymore + * debian/patches/04_hald_scripts.patch + debian/patches/06_more_buttons.patch + debian/patches/08_probe_serial.patch + debian/patches/09_sony_brightness.patch + debian/patches/12_refresh_acpi_states.patch + debian/patches/14_probe_volume_invalidlabel.patch + debian/patches/16_dont_stat_autofs.patch + debian/patches/17_fix_dbus_090_build.patch + debian/patches/18_hald_runner_fd_leak.patch + debian/patches/22_recognize_partitions.patch + - Removed. All fixed upstream + * debian/patches/07_suspend2.patch + debian/patches/20_uswsusp.patch + debian/patches/21_acpi_support.patch + - Merged into 02_powerscripts.patch + * debian/patches/hdm-python2.4.patch + - Removed. Not needed anymore since the default python is 2.4 now + * debian/patches/19_sonypi_support.patch + - Updated. Upstream supports spicctrl but assumes it's in a different path + * debian/patches/15_mount_scripts_pmount.patch + - Removed. Replaced by the new version of the mount scripts + * debian/rules: Disable PolicyKit + * debian/control: Add build-depend on libvolume-id-dev + * debian/patches/23_addon_acpi.patch + - Updated. + * debian/control: Add linux-kernel-headers (>= 2.6.17) to the build-depends + for the definition of ARPHRD_IEEE80211_RADIOTAP + * debian/hal.install: Scripts are no longer in /usr/share/hal but in + /usr/lib/hal + * debian/patches/03_macbookpro_configure.patch + - Added. Change configure so the macbook pro utils can actually be + disabled. + * debian/rules: Disable the macbook pro backlight addon. + * debian/patches/04_cd_write.patch + - Added. don't crash on cd drives without write capabilities (From + upstream git) + * debian/patches/05_one_formfactor_fallback.patch + - Added. Use one fallback to an unknown formfactor instead of three. Fixes + bugs caused by falling back when not needed. + * debian/patches/06_smbios_return.patch + - Added. Only let the prober return success if it actually found some + usefull info. + * debian/patches/07_ppc_suspend.patch + - Added. pmu systems can suspend by using hal's own tool. So actually flag + it as being able to suspend even though mem isn't in /sys/power/state + * debian/patches/08_openfirmware.patch + - Added. Extra model and machine compatibility from openfirmware and + use that info to detect the formfactor. + * debian/debian-storage-policy-fixed-drives.fdi + - Added. Add policy to hal so it refuses to mount and unmount fixed + drives. + * debian/patches/09_check_hashtable_initialisation.patch + - Added. Check if the udi to method queue hashtable is initialized before + using it. (From upstream) + * debian/patches/10_callout_errors.patch + - Added. Use dbus_error_free instead of LIBHAL_FREE_DBUS_ERROR. Ensures + errors correctly reach hald-runner. + * debian/patches/11_no_useless_runner_errors.patch + - Added. Only let hald-runner output warnings if there was actually an + error. + + -- Sjoerd Simons Mon, 2 Oct 2006 18:55:05 +0200 + +hal (0.5.7.1-2) unstable; urgency=low + + * debian/patches/22_recognize_partitions.patch + - Added. More robust recognition that a block device is a partition. Fixes + detecting scsi cdrom drives as partitions (From upstream git) + (Closes: #383792) + * debian/patches/23_addon_acpi.patch + - Added. Don't use the kernel acpi event interface if acpid is installed. + (Closes: #380520, #352512) + * debian/README.Debian: Update documentations about the configuration of the + callouts. Also mention how hal's acpi addon interacts with acpid. + * debian/hal.dirs: Remove /var/run/hal from hal.dirs. Let the init scripts + takes care of its creation. (Closes: #385270) + * debian/hal.postinst: Don't create a homedir for hal. + * debian/hal.preinst: Remove the old hal user. As deluser --system only + removes system users this should be safe. + * debian/hal.postrm: Don't delgroup the daemon user on purge, deluser + already takes care of that. + * debian/hal.postrm: Remove the /var/run/hal dir on purge + * debian/patches/21_acpi_support.patch: + - Updated. Use the force argument to the sleep and hibernate call + (Closes: #384120) + * debian/patches/debian/patches/19_sonypi_support.patch: + - Updated. The spicctrl tool is installed in a different location on + debian then what upstream assumes. + + -- Sjoerd Simons Mon, 4 Sep 2006 23:22:49 +0200 + + +hal (0.5.7.1-1) unstable; urgency=low + + [ Sjoerd Simons ] + * New upstream release + * debian/hal.postinst,debian/hal.postrm,debian/rules: Rename the hal daemon + user to haldaemon (was hal) + * debian/hal.postinst: Created the plugdev system group if it doesn't exist + * debian/hal.links: Change the udev rules.d link from 050_hal-plugdev.rules + to z99_hal.rules to ensure hal gets its data after all the udev magic. + * debian/patches/09_sony_brightness.patch: + - Apply trivial upstream patch to fix LCD brightness setting on Sony + laptops. + - From the ubuntu hal package which took it from upstream, thanks to Paolo + Borelli + * debian/patches/12_refresh_acpi_states.patch: + - Added. refresh ACPI events after suspend/hibernate + - From the ubuntu hal package, patch created by Paul Sladen based on + upstream CVS. + * debian/patches/14_probe_volume_invalidlabel.patch + - Added. Don't try to fix device labels with invalid UTF-8 characters if + more than 20% of the characters is invalid. This avoids totally + unintelligible labels while still preserving only mildly damaged ones. + - From the ubuntu hal package, patch created by Martin Pitt + * debian/patches/15_mount_scripts_pmount.patch: + - Change mount/umount scripts to call pmount-hal/pumount as the + destination user instead of mount/umount as root. This way, we do not + have to rely on hal properties for sanity checking, which are unreliable + in hal's current trust model. + - Change eject script to call eject as the destination user instead of + root. + - This change should be completely transparent to the outside world, so + that KDE and gnome-mount will just work. (Closes: #377689) + - From the ubuntu hal package, patch created by Martin Pitt. + * debian/patches/16_dont_stat_autofs.patch: + - Added. Don't stat autofs filesystems as that will remount. + (Closes: #361785) (From upstream git) + * debian/patches/17_fix_dbus_090_build.patch: + - Added. Fix build with dbus >= 0.90 (From upstream git) + * debian/patches/18_hald_runner_fd_leak.patch + - Added. Fix fd leak in hald-runner. Patch by Mike Hommey (Closes: #375143) + * debian/patches/debian/patches/19_sonypi_support.patch: + - Added. Support sonypi using laptops (Closes: #375144) (From upstream git) + * debian/patches/07_suspend2.patch: + - Updated. Don't try to use suspend2 to suspend a pmu machine, which can + crash the machine. (Closes: #366008) + * debian/patches/20_uswsusp.patch: + - Added. Use uswsusp for suspend and hibernation if available. Patch by + Tim Dijkstra. (Closes: #382183) + * debian/patches/21_acpi_support.patch: + - Added. Use acpi-support for suspend and hibernation if available. + (Closes: #381708) + + [ Sebastian Dröge ] + * debian/pycompat, + debian/control, + debian/rules: + + update to the new Python Policy + * debian/control: + + Bump Standards-Version to 3.7.2 + + Add myself to Uploaders + + -- Sjoerd Simons Tue, 15 Aug 2006 15:45:35 +0200 + +hal (0.5.7-2) unstable; urgency=low + + * debian/hal.udev.rules + + Fix broken udev syntax (Closes: #364324) + * Bump compat version to 5 + * Killing hal with brute force in prerm shouldn't be needed anymore + * Don't install hal's default udev rules file, we ship our own + (Closes: 359749) + * debian/patches/07_suspend2.patch + + Added. Possibility to use hibernate to suspend-to-ram + * debian/patches/08_probe_serial.patch + + Only probe legacy serial ports. Fixes issue with usb serial ports from + wince pda's that can't handle the probing (Closes: #352934) + + -- Sjoerd Simons Mon, 1 May 2006 22:42:50 +0200 + +hal (0.5.7-1) unstable; urgency=low + + * New upstream release + * debian/patches/02_hal_addon_pmu.patch + + Removed. Fixed upstream + * debian/patches/03_hald_runnerpath.patch + + Removed. Fixed upstream + * debian/patches/05_pmu_nohibernate.patch + + Updated. Fix crash when power_management.type is not set (Thanks Martin + Pitt) + * debian/patches/06_more_buttons.patch + + Added. Update button signal names to the new convention and also + recognize mute, volume up/down buttons, switchvideo mode button and + keyboard illumination toggle/down/up buttons. + * Update debian/README.Debian + + -- Sjoerd Simons Thu, 2 Mar 2006 18:56:03 +0100 + +hal (0.5.6+cvs20060219-1) experimental; urgency=low + + * CVS snapshot + * debian/patches/01_hal_privsep.patch + + Removed. Fixed upstream + * debian/patches/02_hal_addon_pmu.patch + + Updated + * debian/patches/03_storage_sigio.patch + + Removed. Fixed upstream + * debian/patches/04_hald-no-patch.patch + + Removed. Fixed upstream + * debian/patches/05_hald_clear_udev_buffer.patch + + Removed. Fixed upstream + * Sync with Ubuntu + + Remove unneeded build-depends (libsysfs-dev and libcap-dev) + + force-reload dbus instead of reload + + Remove obsolete fdi example conffile + + Add small utility script to run hald from the debian dir. + * debian/patches/storage-policy-debian.patch + + Removed. Obsolete + * debian/patches/03_hald_runnerpath.patch + + Added. Give programs run by the runner a save PATH + * debian/patches/04_hald_scripts.patch + + Added. Fix various bugs in the hal scripts + * Add the powerdev group in postinst + * debian/patches/01_hal_debian_dbuspolicy.patch + + Added. Change the hal dbus policy to allow user part of the powerdev + group to use the org.freedesktop.Hal.Device.SystemPowerManagement and + org.freedesktop.Hal.Device.LaptopPanel interfaces. + + -- Sjoerd Simons Mon, 20 Feb 2006 23:24:34 +0100 + +hal (0.5.6-4) unstable; urgency=high + + * debian/patches/05_hald_clear_udev_buffer.patch + + Added. Clear the buffer where udev events are received before using + (from hal CVS) + + -- Sjoerd Simons Mon, 13 Feb 2006 18:59:12 +0100 + +hal (0.5.6-3) unstable; urgency=high + + * debian/patches/01_hal_privsep.patch + + Updated. Fix deadlock when using ATAPI Zip-drives (Closes: #351296) + + -- Sjoerd Simons Sun, 12 Feb 2006 17:52:58 +0100 + +hal (0.5.6-2) unstable; urgency=low + + * debian/patches/01_hal_privsep.patch + + Updated to current CVS version + * udev communicated events to hal via a socket now, which as a side-effect + fixes incompatibility with udev 0.83 (Closes: #350639, #350762) + * Let hal look in the right location for the pci.ids and usb.ids files + (Closes: #341824) + * Because the addons run with root privs. now, harddisk properties are + available (Closes: #290653) + * debian/patches/03_storage_sigio.patch + + Added. Switch EjectButton detection to SG_IO interface. Solves some + problems with scsi cdrom drives (from hal CVS) + * debian/patches/04_hald-no-patch.patch + + Added. Also start correctly when PATH is not set (Closes: #345391) + + -- Sjoerd Simons Wed, 1 Feb 2006 23:59:58 +0100 + +hal (0.5.6-1) experimental; urgency=low + + * New upstream release + * debian/patches/hal-dbus_max_match_rules_per_connection.patch + + Removed. Default max_match_rules in dbus is high enough these days + * Don't add the hal to group floppy and cdrom + * Stop using the hotplug helper, instead let udev pass data via a socket to + hal + * debian/patches/01_hal_privsep.patch + + Added. Let the addons and probes be called by a little helper running as + root while the main hal database runs as an unpriviledged user. + * No longer chown removable device to group hal + * debian/patches/02_hal_addon_pmu.patch + + Added. Use a direct connection to hal, because it might not be on the + system bus yet. Open /dev/adb non-block so read blocks instead of + getting EAGAIN and failing. + + -- Sjoerd Simons Thu, 19 Jan 2006 23:12:56 +0100 + +hal (0.5.5.1-5) unstable; urgency=low + + * Tighten depends on dbus and python2.4-dbus a little bit more + * Fix a bashim in the postinst script (Closes: 347326) + + -- Sjoerd Simons Thu, 12 Jan 2006 00:38:47 +0100 + +hal (0.5.5.1-4) unstable; urgency=low + + * Upload to unstable + * Add python to the build-depends for dh_python + + -- Sjoerd Simons Thu, 5 Jan 2006 22:36:33 +0100 + +hal (0.5.5.1-3) experimental; urgency=low + + * Let libhal-dev and libhal-storage-dev depend on libdbus-1-dev (>= 0.60) + + -- Sjoerd Simons Fri, 16 Dec 2005 15:37:21 +0100 + +hal (0.5.5.1-2) experimental; urgency=low + + * Use log_daemon_msg instead of log_begin_msg in the init script + (Closes: #339728) + * Build against dbus 0.60 + + -- Sjoerd Simons Thu, 15 Dec 2005 12:02:22 +0100 + +hal (0.5.5.1-1) experimental; urgency=low + + * New upstream release + * Sync with ubuntu (Thanks Martin Pitt) + + Make libhal-storage-dev depend libhal-dev + + Fix rm_conffile in hal.preinst + + Install hal-find-by-capability and hal-find-by-property + + Translation updates for hal-device-manager.desktop + * Never restart dbus in postinst or postrm . Only reload it's config. + * Depend on libusb-dev to build hald-addon-usb-csr (Closes: #335530) + * Build hal-device-manager again. + * debian/patches/hdm-python2.4.patch + + Force hal-device-manager to use python2.4 + * Install /usr/bin/hal-device + + -- Sjoerd Simons Tue, 15 Nov 2005 14:18:58 +0100 + +hal (0.5.4-2) experimental; urgency=low + + * Hal doesn't include hal.dev anymore, so don't try to execute it in the + udev rules (Closes: #326957) + * Package doesn't ship fstab-sync, so also don't ship it's manpage. + + -- Sjoerd Simons Thu, 8 Sep 2005 10:36:03 +0200 + +hal (0.5.4-1) experimental; urgency=low + + * New upstream release + * use udev RUN rules instead of the hotplug.d and dev.d script dirs + * Install hal-umount.sh in /usr/lib/hal instead of usr/lib/hal/hal-umount.sh + * debian/patches/property-null-values.patch + + Removed. Fixed upstream + * Sync with ubuntu + + Switched the init script to lsb-base + + hal.init.dbus: If hald does not want to die in do_stop, use the "yes, + we really mean it" approach to ensure clean restarts. + + debian/patches/storage-policy-debian.patch + - Dropped noatime/sync handling hunk since upstream now does the right + thing. + - Enable storage.requires_eject on USB storage devices to always + eject them (which causes them to properly power off). + + Only (re)start dbus when hal isn't already running. + + Update the manpage + + -- Sjoerd Simons Sat, 27 Aug 2005 22:31:21 +0200 + +hal (0.5.2-1) experimental; urgency=low + + * New upstream release + * Don't build hal-device-manager for now as it needs python2.4 gnome + packages + * Based on Ubuntu's hal 0.5.2 by Martin Pitt. + * Removed no longer relevant patches: + + debian/patches/harddisk-volumes.patch + + debian/patches/ids-search.patch + + debian/patches/hal-fdi.patch + + debian/patches/hotplug_timeout.patch + + debian/patches/patches/no_sysdevice.patch + + debian/paches/hal-hotplug-map.patch + * debian/ipod-music-player.fdi + + Fixed upstream + * debian/hal-device-manager.desktop + + Updated with new translations from the Ubuntu package + + -- Sjoerd Simons Tue, 21 Jun 2005 15:28:18 +0200 + +hal (0.4.8-2) unstable; urgency=low + + * debian/ipod-music-player.fdi + + Fix xml errors (Closes: #312817) + * debian/patches/storage-policy-debian.patch + + Enable the utf8 mount option for cdrom drives and iso9660 and udf + filesystems. (Closes: #312818) + + -- Sjoerd Simons Fri, 10 Jun 2005 15:50:45 +0200 + +hal (0.4.8-1) unstable; urgency=low + + * New upstream release + * debian/patches/storage-policy-zip.patch + + Removed. Merged upstream + * debian/patches/ids-search.patch + + Updated + * debian/patches/hotplug_timeout.patch + + Updated to work with dbs-edit-patch + * debian/hal.udev.device-removable.sh + + Fixed problem with detection of firewire disks (Closes: #309822) + * debian/patches/storage-policy-debian.patch + Don't set the sync mount option by default on smaller drives (flash + drives). Especially on newer kernels this can wear out media too fast. + * debian/preferences.fdi + Warn for media wear in the example fdi file when enabling the sync option. + + + -- Sjoerd Simons Mon, 23 May 2005 19:49:56 +0200 + +hal (0.4.7-4) unstable; urgency=low + + * Add fdi file to recognize Apple Ipods + * Improved udev script for removable drives detection (Thanks to Marco d'Itri) + * Move hal-plugdev.rules link after the setting of permissions, but before + naming of devices files. Enables the hal/gnome-volume-manager combination to + work with systems using devfs like naming (Closes: #302134) + * Added an example to set the group id and umask of a mounted volume to + preferences.fdi. (Closes: #303720) + * Have the dbus init script wait for hal to actually shutdown, when stopping. + + -- Sjoerd Simons Sat, 7 May 2005 00:17:11 +0200 + +hal (0.4.7-3) unstable; urgency=low + + * Remove 50-fstab-sync.hal symlink from the package, it's not supposed to be + used in hal's default config. (Closes: #298562) + * Added debian/patches/hotplug_timeout.patch + + Don't run the hotplug timeout handler while processing hotplug events. + (Closes: #292256) + * Fixes from the ubuntu package: + + Added debian/patches/hal-dbus_max_match_rules_per_connection.diff + - Allow more matching rules per connection. Fixes problems with + hal-device-manager on systems with lots of devices. + + Added debian/patches/harddisk-volumes.patch + - fdi/90defaultpolicy/storage-policy.fdi: If a volume has an empty + fsusage, set it to "filesystem" to work around the fact that the + non-root hald cannot read harddisk partitions. + - libhal-storage/libhal-storage.c: Do not declare a volume as invisible + if hal does not know the file system (hald cannot read harddisk + partitions). + + -- Sjoerd Simons Fri, 18 Mar 2005 19:25:04 +0100 + +hal (0.4.7-2) unstable; urgency=low + + * debian/patches/storage-policy-debian.patch + + Updated. Enable the quiet option for vfat volumes. (Closes: #292661) + * debian/hal.dbus.init + + Show a warning message when trying to start with an unsupported kernel. + (Closes: #292644) + * debian/patches/no_sysdevice.path + + Don't die when a device doesn't have a sysfs path when finalizing the + class device. (Closes: #293630) + * debian/patches/storage-policy-zip.patch + + Added. Correctly name partitioned zip mountpoints. Patch from Daniel + Serpell. (Closes: #294033) + + -- Sjoerd Simons Tue, 15 Feb 2005 11:51:34 +0100 + +hal (0.4.7-1) unstable; urgency=medium + + * New upstream release + + hal-device-manager handles ieee1394 now (Closes: #290931) + * Added watch file + + -- Sjoerd Simons Tue, 25 Jan 2005 15:25:51 +0100 + +hal (0.4.6-1) unstable; urgency=low + + * New upstream release + + Fixes various problems with vfat label detection (Closes: #271997) + * Enable building of fstab-sync as some people seem to like it + (Closes: #290780) + * debian/patches/storage-policy-debian.patch. + + Updated. Copy block.policy.desired_mount_point from block.storage to + volume.policy.desired_mount_point if the blockdevice has no partitions + (Closes: #290963) + + -- Sjoerd Simons Fri, 21 Jan 2005 17:27:34 +0100 + +hal (0.4.5-1) unstable; urgency=low + + * New upstream release + * Removed patches that were fixed/merged upstream + + debian/patches/check-ide-floppy-for-zip.patch + + debian/patches/volume_id-fat.patch + + -- Sjoerd Simons Thu, 13 Jan 2005 16:46:12 +0100 + +hal (0.4.4-2) unstable; urgency=low + + * debian/patches/volume_id-fat.patch + + Added. Fixes label reading on large FAT volumes. Patch from Kay Sievers. + (Closes: #271997) + * debian/patches/check-ide-floppy-for-zip.patch + + Added. Support IDE Zip drives that appear as IDE floppies. Patch from + David Zeuthen. + + -- Sjoerd Simons Mon, 10 Jan 2005 09:28:55 +0100 + +hal (0.4.4-1) unstable; urgency=low + + * New upstream release + * Removed patched that were merged/fixed upstream: + + debian/patches/netdev-recovery.patch + + -- Sjoerd Simons Fri, 7 Jan 2005 11:29:56 +0100 + +hal (0.4.3-1) unstable; urgency=low + + * New upstream release + * Start using tarball.mk from cdbs + * Removed patched that were merged/fixed upstream: + + debian/patches/cdrom-fdleak.patch + + debian/patches/cdrom-media-check.patch + + debian/patches/fix-ide-fdi.patch + + debian/patches/fstab-sync-crash.patch + + debian/patches/poll-only-cdroms.patch + + debian/patches/special_mtab_chars.patch + * debian/patches/netdev-recovery.patch + + Added. Fixes a crash in the netdev recovery code (Closes: #288089) + * debian/hal.udev.rules + + The only ide drives hal polls are cdroms, so it's unnecessary to set the + group of other removable ide drives to hal. (Closes: #288301) + * Stop shipping sony_dsc.fdi, it just causes problems. + * debian/patches/ids-search.patch + + Updated + * debian/patches/z_update_autofoo.patch + + Removed, not necessary anymore because of the ids-search.patch update + + -- Sjoerd Simons Tue, 4 Jan 2005 18:26:44 +0100 + +hal (0.4.2-6) unstable; urgency=low + + * debian/patches/cdrom-fdleak.patch + + Added. Don't leak a filedescriptor to the cdrom device when the + filesystem on a data cd isn't recognized. Patch from Peter Österlund + (Closes: #287779) + + -- Sjoerd Simons Thu, 30 Dec 2004 15:29:04 +0100 + +hal (0.4.2-5) unstable; urgency=high + + * Create /var/run/hal dir on start if it's not there (Closes: #287258) + + -- Sjoerd Simons Sun, 26 Dec 2004 15:27:45 +0100 + +hal (0.4.2-4) unstable; urgency=high + + * Only add hal to group cdrom and floppy when creating the user. This way it + won't get added on upgrade if the admin removed it. (Closes: #286790) + * debian/hal-unmount.dev + + Also check /etc/mtab to see if the device is mounted. (Closes: #286579) + * Urgency high. Fixes an RC bug. + + -- Sjoerd Simons Sun, 19 Dec 2004 20:42:37 +0100 + +hal (0.4.2-3) unstable; urgency=low + + * debian/patches/special_mtab_chars.patch + + Added. In /etc/mtab and /proc/mounts some special chars (like space) are + encoded in octal from. Decode these into normal chars again. Fixes + problems with spaces in mountpoints (Closes: #284322) + * debian/hal-unmount.dev: + + Sanity-check $DEVNAME to make sure it begins with a slash, so we don't + get bitten by DEVNAME=-a or DEVNAME="". Thanks to Scott James Remnant + + -- Sjoerd Simons Sun, 19 Dec 2004 18:32:47 +0100 + +hal (0.4.2-2) unstable; urgency=medium + + * debian/patches/fstab-sync-crash.patch + + Added. Don't crash on cleaning fstab in certain + circumstances (Closes: #284721) + * debian/patches/ids-search.patch + + Added. Search for pci.ids and usb.ids runtime. Fixes problems when the + location changes or if it is different then on the machine hal was build + on. + * debian/patches/fix-ide-fdi.patch + + Added. Correct syntax error in the fdi file + * debian/patches/cdrom-media-check.patch + + Added. Some CD-ROMs report that they contain a CD even if the tray is + open; probe CDROM_MEDIA_CHANGED twice to check whether there is indeed a + CD inside.Thanks to Michael Hofmann for discovering this and + finding the fix. + * debian/patches/poll-only-cdroms.patch: + + Added. Instead of trying to work around broken ide pcmcia device just + poll cdrom on the ide bus. Patch from David Zeuthen (Closes: #284164) + * debian/patches/z_update_autofoo.patch: + + Added. Update configure, this is needed by ids-search.patch. + + -- Sjoerd Simons Wed, 08 Dec 2004 16:18:14 +0100 + +hal (0.4.2-1) unstable; urgency=low + + * New upstream release + * Remove patches that have been merged upstream: + + debian/patches/device-manager-glade.patch + + debian/patches/device-manager.patch + + -- Sjoerd Simons Thu, 2 Dec 2004 13:13:50 +0100 + +hal (0.4.1-2) unstable; urgency=low + + * Rename the hal dbus start script from hal to 20hal. Makes it simpler to + order startup of dbus services. + * Let hald run as non-root by default + * Use a dev.d script for lazy device umount. So hald doesn't need too. + (Script from the ubuntu package) + * Install udev configuration to make removable devices owned by group hal + (Adapted from the ubuntu package) + * Call udevsend for all block devices in the postinst. To ensure + the permissions are set right for already available devices. + * debian/README. Updated to reflect we run as user hal by default now. + * debian/patches/storage-policy-debian.patch. + + Updated. turn off sync and noatime for drivers bigger then 2GB. + * /etc/hal/fdi/preferences.fdi + + Added. Some examples of system settings that can be tweaked via hal's + database. + * debian/patches/storage-policy-debian.patch. + + Updated. Disable the managed keyword again, so we don't have to depend + on a mount version that's already frozen. + + -- Sjoerd Simons Mon, 8 Nov 2004 23:59:23 +0100 + +hal (0.4.1-1) unstable; urgency=low + + * New upstream release + + Fixes fstab-sync crash when called without options (Closes: #278468) + + Detects highpoint ata raid configurations (Closes: #277534) + * debian/hald.8: Fixed typos + * debian/rules: Correctly generate the python dependencies for + hal-device-manager + * debian/hal.postinst: Don't fail when the dbus-1 init script isn't + available yet + * Removed patches (adopted upstream): + + debian/patches/fstab-sync.patch + + debian/patches/nonblock.patch + + debian/patches/storage-policy-uudi.patch + * debian/patches/storage-policy-debian.patch + Updated. Usage comment=fstabsync as option for fstab-sync mount lines + * debian/patches/hal-fdi.patch + Added. Look for user fdi files in /etc/hal/fdi + * debian/patches/device-manager.patch + Added. Fill the Device type and Capabilities field (Patch from Bryan Clark) + * debian/patches/device-manager-glade.patch + Added. Improve the appearance of the Device tab in h-d-m + * debian/patches/hal-hotplug-map.patch + Added. Check if the usb device isn't actually an usb mass storage device + before setting libgphoto2 support properties. Fixes problems with + olympus cameras, because PtP and UMS versions have the same usb id's + (Closes: #279395) + + -- Sjoerd Simons Sat, 06 Nov 2004 19:59:37 +0100 + +hal (0.4.0-1) experimental; urgency=low + + * New upstream release + * Marin Pitt: + + New packages libhal-storage0 and libhal-storage-dev for new hal-storage + library + + Removed patches (adopted upstrem): + - add_device_nullarg.patch + - fix_first_hotplug.diff + - hal-cdspeed.patch + - nofail_nocaps.patch + - pci_pre_process_check_null.diff + + debian/lshal.1: properly quoted dashes + + * Sjoerd Simons: + + Removed patches (adopted upstream): + - pciid-fdleak.patch + - usbdb-fdleak.patch + - fs_probing.patch + - haldb-require-privs.patch + - libgphoto2-usermap.patch + - netlink_spoofing.patch + + No longer shipping the fstab-update script + + debian/hal.preinst: Stop hal in preinst instead of dbus + + debian/hal.preinst: Add missing debhelper token + + debian/hal.preinst: Remove fstab-update.h transition. + + Added /etc/default/hal to easily configure running hal as non-root + + Added debian/patches/fstab-sync.patch (from CVS HEAD) + - Use the name of the special device file instead of 'foo' when writing + to the syslog. + - clean wasn't being called on hald startup because of missing defines + due to the removal of fstab-sync options + + Added debian/patches/nonblock.patch (from CVS HEAD) + - Fixes wrong handling of O_NONBLOCK by hal when probing the fileystem + type (by removing it) + + Added debian/patches//storage-policy-uudi.patch (from CVS HEAD) + - Never use filesystem UUDI for mount points in the default policy + + Ship fstab-sync.8 manpage + + Added debian/patches/storage-policy-debian.patch + - Change to storage policy to match the behaviour of previous hal + debian packages. + + -- Sjoerd Simons Mon, 18 Oct 2004 16:30:01 +0200 + +hal (0.2.98-5) unstable; urgency=high + + * Restart dbus on postinst instead of starting, fixes problems on upgrade + and install (Closes: #277050) (Closes: #277035) + * debian/patches/netlink_spoofing.patch + + Added. Check PID of netlink packets to prevent spoofing from user + processes (from CVS HEAD) + * High priority because it fixes upgrade and install problems. + + -- Sjoerd Simons Sun, 17 Oct 2004 20:19:48 +0200 + +hal (0.2.98-4) unstable; urgency=medium + + * Also restart dbus when hal is freshly installed. + + -- Sjoerd Simons Sun, 17 Oct 2004 19:45:26 +0200 + +hal (0.2.98-3) unstable; urgency=medium + + * debian/patches/haldb-require-privs.patch + + Added. Only allow root and the hal's current user to change things in + the hal's database (from CVS HEAD with some enhancements) + * Doesn't crash when SIOCGMIIREG fails (Closes: #276297) + + -- Sjoerd Simons Sun, 10 Oct 2004 19:57:52 +0200 + +hal (0.2.98-2) unstable; urgency=medium + + * Goodies from the Ubuntu hal packages (thanks to Martin Pitt) + + Properly quote dashes in the manpages + + German translation of hal-device-manager.desktop + * debian/patches/add_device_nullarg.patch + + Added. check whether given_sysfs_path is NULL and + immediately return in this case; previously, this parameter was copied + and compared without checking. (from ubuntu package) + * debian/patches/fix_first_hotplug.patch + + Added. Fixes race conditions with regard to the first hotplug event + (from CVS HEAD) + * debian/patches/fs_probing.patch + + Added. Fixes some file probing issues (from CVS HEAD) + * debian/patches/nofail_nocaps.patch + + Added. Don't fail on a kernel without capablities if privileges are + dropped (from Ubuntu package) + * debian/patches/pci_pre_process_check_null.patch + + Added. Added extra NULL pointing checking (from Ubuntu package) + * debian/patches/pciid-fdleak.patch + + Added. Close file descriptors after reading the pci id database + * debian/patches/usbdb-fdleak.patch + + Added. Close file descriptors after reading the usb id database + * Make fstab-update.hal POSIX compliant (patch from Martin Waitz) + (Closes: #274937) + + -- Sjoerd Simons Sun, 10 Oct 2004 17:31:40 +0200 + +hal (0.2.98-1) unstable; urgency=high + + * New upstream release + * Fixes endless loop in FAT32 label reading code (Closes: #273001) + * Make it possible to run hal with dropped priviledges + (not enabled by default) + * Put hal-device-manager in it's own package (Closes: Bug#239122) + * Install hal-hotplug-map helper + * Updated hald manpage + * Created hal-device-manager manpage + * Disable selinux for now. A newer libselinux then in debian is needed. + * debian/patches/hal-cdspeed.patch + + Added. Fix for unchecked buffer access from Martin Pitt + * debian/patches/libgphoto2-usermap.patch + + Added. Let hal-hotplug-map work correctly with the libgphoto2 hotplug + config. + * Urgency high because this fixes RC bugs + + -- Sjoerd Simons Sun, 26 Sep 2004 11:10:45 +0200 + +hal (0.2.97+cvs20040907-1) unstable; urgency=high + + * New maintainer. + * New CVS snapshot (Closes: Bug#266158) + * More robust hotplugging code (Closes: Bug#264597) + * libhal.la no long declares a bogus dependency on libexpat + (Closes: Bug#266667) + * debian/patches/hal_volume_utf8.patch + + removed. Already fixed upstream + * Changed fstab-update.sh to fstab-update.hal. Only callouts with the .hal + extension are invoked now. + * Conflict with old gnome-volume-manager + * Urgency high because it fixes RC bugs in testing + + -- Sjoerd Simons Tue, 7 Sep 2004 22:17:15 +0200 + +hal (0.2.97-0.1) unstable; urgency=low + + * NMU for New upstream release. + + sarge freezes tomorrow, this should beat the deadline. + + Works with D-BUS 0.22 and above. + * Tighten D-BUS Build-Deps/Depends to >= 0.22. + + -- Daniel Stone Mon, 16 Aug 2004 17:34:37 -0700 + +hal (0.2.95-5) unstable; urgency=medium + + * Urgency medium as this release should enter testing soon + * Replace hal_volume_utf8.patch with hal_validate_utf8.patch + + -- Martin Waitz Mon, 2 Aug 2004 20:23:51 +0200 + +hal (0.2.95-4) unstable; urgency=low + + * Manage patches with quilt. + * Apply hal_volume_utf8.patch and hal_mounted_on_startup.patch + from Sjoerd Simons (Closes: #261723) + + -- Martin Waitz Wed, 28 Jul 2004 21:34:56 +0200 + +hal (0.2.95-3) unstable; urgency=low + + * Explicitly depend on dbus 0.21-7 to get hald started (Closes: #261582) + + -- Martin Waitz Tue, 27 Jul 2004 23:15:40 +0200 + +hal (0.2.95-2) unstable; urgency=low + + * Build-depend on libpopt-dev + + -- Martin Waitz Sat, 24 Jul 2004 21:43:18 +0200 + +hal (0.2.95-1) unstable; urgency=low + + * New upstream release (Closes: #259860) + - hal hotplug helper executes in background (Closes: #237836) + - hal-device-manager shows error message in dialog (Closes: #233854) + * debian/rules: use upstream doc/api Makefiles to build docs. + * debian/{rules,hal.postinst,hal.init,hal.init.dbus}: + Start hald together with dbus (Closes: #231704) + * Apply patch from David Weinehall to make + the fstab update script not require bash (Closes: #259293) + * Cleanup syslog usage in the hotplug helper + * remove HACKING reference from README (Closes: #260241) + * fix hal-device-manager when info.product key misses + + -- Martin Waitz Fri, 23 Jul 2004 21:33:03 +0200 + +hal (0.2.93+20040711-2) unstable; urgency=low + + * rerun libtoolize to fix libhal0, argh. (Closes: #259111) + + -- Martin Waitz Tue, 13 Jul 2004 21:45:20 +0200 + +hal (0.2.93+20040711-1) unstable; urgency=low + + * New CVS checkout (Closes: #257781) + - includes part of my get-properties patch (Closes: #238175) + * debian/control: build-depend on python (Closes: #258461) + * add shlib file (Closes: #253779) + * support vc class in linux hotplug helper (Closes: #258112) + + -- Martin Waitz Mon, 12 Jul 2004 23:43:54 +0200 + +hal (0.2.92-1) unstable; urgency=low + + * New upstream release + * debian/README.Debian: add note about fstab-update callout + * fix COPYING, by accident it only contained the GPL + + -- Martin Waitz Tue, 8 Jun 2004 21:51:44 +0200 + +hal (0.2.91-1) unstable; urgency=low + + * New upstream release + + -- Martin Waitz Wed, 26 May 2004 00:28:25 +0200 + +hal (0.2.90+20040515-1) unstable; urgency=low + + * New CVS checkout + * debian/fstab-update.sh: add example from cvs tree + * debian/rules: install fstab-update.sh as example into hal/device.d + (but leave it -x for now to disable it) + + -- Martin Waitz Sat, 15 May 2004 19:55:11 +0200 + +hal (0.2.90+20040511-1) unstable; urgency=low + + * New CVS checkout + + -- Martin Waitz Tue, 11 May 2004 20:13:53 +0200 + +hal (0.2.90+20040424-1) unstable; urgency=low + + * New CVS checkout + + -- Martin Waitz Sat, 24 Apr 2004 13:15:48 +0200 + +hal (0.2.6+20040331-1) unstable; urgency=low + + * New CVS checkout + + -- Martin Waitz Wed, 31 Mar 2004 22:25:22 +0200 + +hal (0.2.6+20040311-1) unstable; urgency=low + + * New CVS checkout (Closes: #237436) + * don't die if usbfs is not mounted (Closes: # 234364) + * print better error message if hald is not runnig (one part of #233854) + + -- Martin Waitz Thu, 11 Mar 2004 20:51:59 +0100 + +hal (0.2.6-4) unstable; urgency=low + + * debian/hal.postinst: restart dbus on configure, so that it + reads our dbus policy configuration file + * debian/control: add dependency on some python modules and usbutils + (Closes: #231312, #231555, #231607) + + -- Martin Waitz Sat, 7 Feb 2004 21:49:57 +0100 + +hal (0.2.6-3) unstable; urgency=low + + * first upload to unstable + * debian/control: add phython2.3-dbus dependency + + -- Martin Waitz Thu, 5 Feb 2004 22:07:22 +0100 + +hal (0.2.6-2) experimental; urgency=low + + * Merge with package from Ross Burton + - debian/control: add hal-doc, update build-depends + - debian/rules: build documentation + - debian/hal-doc.install: include dokumentation in hal-doc + - debian/hal.postrm: new file + - debian/hal-device-manager.desktop: new file + - debian/hal.install: add desktop file + + -- Martin Waitz Tue, 27 Jan 2004 02:31:10 +0100 + +hal (0.2.6-1) experimental; urgency=low + + * Initial Release. (Closes: #217468) + + -- Martin Waitz Tue, 20 Jan 2004 01:41:51 +0100 + --- hal-0.5.10.orig/debian/hal.postinst +++ hal-0.5.10/debian/hal.postinst @@ -0,0 +1,66 @@ +#! /bin/sh +# postinst script for hal +# +# see: dh_installdeb(1) + +set -e + +# summary of how this script can be called: +# * `configure' +# * `abort-upgrade' +# * `abort-remove' `in-favour' +# +# * `abort-deconfigure' `in-favour' +# `removing' +# +# for details, see http://www.debian.org/doc/debian-policy/ or +# the debian-policy package +# +# quoting from the policy: +# Any necessary prompting should almost always be confined to the +# post-installation script, and should be protected with a conditional +# so that unnecessary prompting doesn't happen if a package's +# installation fails and the `postinst' is called with `abort-upgrade', +# `abort-remove' or `abort-deconfigure'. + +case "$1" in + configure) + getent passwd haldaemon >/dev/null || \ + adduser --system \ + --disabled-password \ + --no-create-home \ + --gecos "Hardware abstraction layer" \ + --quiet \ + --group haldaemon + + # Add the powerdev group (power management) + addgroup --quiet --system powerdev || true + + # Add the plugdev group (mounting removable devices) + addgroup --quiet --system plugdev || true + + # do not reload on dapper->hardy upgrades + if [ -x /etc/init.d/dbus ] && dpkg --compare-versions "$2" gt 0.5.7.1; then + invoke-rc.d dbus force-reload || true + fi + + # finish the udev rules rename on upgrades + if dpkg --compare-versions "$2" le-nl "0.5.8.1-3ubuntu7"; then + rm -f /etc/udev/rules.d/85-hal.rules.moved-by-preinst + fi + + ;; + abort-upgrade|abort-remove|abort-deconfigure) + ;; + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 --- hal-0.5.10.orig/debian/hal.manpages +++ hal-0.5.10/debian/hal.manpages @@ -0,0 +1,10 @@ +debian/tmp/usr/share/man/man8/hald.8 +debian/tmp/usr/share/man/man1/hal-disable-polling.1 +debian/tmp/usr/share/man/man1/hal-find-by-capability.1 +debian/tmp/usr/share/man/man1/hal-find-by-property.1 +debian/tmp/usr/share/man/man1/hal-get-property.1 +debian/tmp/usr/share/man/man1/hal-is-caller-locked-out.1 +debian/tmp/usr/share/man/man1/hal-is-caller-privileged.1 +debian/tmp/usr/share/man/man1/hal-lock.1 +debian/tmp/usr/share/man/man1/hal-set-property.1 +debian/tmp/usr/share/man/man1/lshal.1 --- hal-0.5.10.orig/debian/hal.dirs +++ hal-0.5.10/debian/hal.dirs @@ -0,0 +1,2 @@ +/var/cache/hald +/var/lib/hal --- hal-0.5.10.orig/debian/hal.docs +++ hal-0.5.10/debian/hal.docs @@ -0,0 +1 @@ +build-tree/*/doc/TODO --- hal-0.5.10.orig/debian/hal.init +++ hal-0.5.10/debian/hal.init @@ -0,0 +1,96 @@ +#! /bin/sh +### BEGIN INIT INFO +# Provides: hal +# Required-Start: $local_fs dbus +# Required-Stop: $local_fs dbus +# Should-Start: $syslog acpid +# Should-Stop: $syslog acpid +# Default-Start: 2 3 4 5 +# Default-Stop: S 0 1 6 +# Short-Description: Hardware abstraction layer +# Description: The HAL daemon collects and maintains information about +# your hardware. +### END INIT INFO + +PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin +DAEMON=/usr/sbin/hald +PIDDIR=/var/run/hal +PIDFILE=$PIDDIR/hald.pid +NAME=hald +DAEMONUSER=haldaemon +DESC="Hardware abstraction layer" + +. /lib/lsb/init-functions + +test -x $DAEMON || exit 0 + +# Include hal defaults if available +if [ -f /etc/default/hal ] ; then + . /etc/default/hal +fi + +set -e + +do_start() { + # a crashing gparted sometimes leaves this behind; a bad hack, but we + # should keep this in place until hal offers a native interface for + # temporarily disabling automount (see LP #134712) + rm -f /usr/share/hal/fdi/policy/gparted-disable-automount.fdi + + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + fi + chown $DAEMONUSER:$DAEMONUSER $PIDDIR + start-stop-daemon --start --oknodo --pidfile $PIDFILE \ + --exec $DAEMON -- $DAEMON_OPTS +} + +do_stop() { + start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \ + --exec $DAEMON +} + +case "$1" in + start) + if [ ! -d /proc/sys/fs/inotify ]; then + log_failure_msg "Can't start $DESC - enable inotify support in your kernel" + exit 0 + fi + if [ ! -e /var/run/dbus/system_bus_socket ]; then + log_failure_msg "Can't start $DESC - please ensure dbus is running" + exit 0 + fi + + if [ ! -d /sys/kernel ]; then + log_failure_msg "Can't start $DESC - sysfs not mounted on /sys" + exit 0 + fi + + if [ "$(stat -c %d/%i /)" != "$(stat -Lc %d/%i /proc/1/root 2>/dev/null)" ]; then + log_failure_msg "Can't start $DESC - detected chrooted session" + exit 0 + fi + + log_daemon_msg "Starting $DESC" "$NAME" + do_start + log_end_msg $? + ;; + stop) + log_daemon_msg "Stopping $DESC" "$NAME" + do_stop + log_end_msg $? + ;; + restart|force-reload) + log_daemon_msg "Restarting $DESC" "$NAME" + do_stop + sleep 1 + do_start + log_end_msg $? + ;; + *) + log_success_msg "Usage: $0 {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- hal-0.5.10.orig/debian/libhal-dev.install +++ hal-0.5.10/debian/libhal-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/hal/libhal.h +debian/tmp/usr/lib/pkgconfig/hal.pc +debian/tmp/usr/lib/libhal.so +debian/tmp/usr/lib/libhal.a --- hal-0.5.10.orig/debian/no-cd-media-check.fdi +++ hal-0.5.10/debian/no-cd-media-check.fdi @@ -0,0 +1,41 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + --- hal-0.5.10.orig/debian/hal.postrm +++ hal-0.5.10/debian/hal.postrm @@ -0,0 +1,36 @@ +#!/bin/sh + +set -e + +# gracefully handle udev rules renaming on upgrade errors +if [ "$1" = abort-install ] || [ "$1" = abort-upgrade ]; then + if dpkg --compare-versions "$2" le-nl "0.5.8.1-3ubuntu7"; then + F=/etc/udev/rules.d/85-hal.rules + if [ -e $F.moved-by-preinst ]; then + mv -f $F.moved-by-preinst $F + fi + fi +fi + +#DEBHELPER# + +if [ "$1" = "purge" ] ; then + # Tell dbus to reload it's configuration files only, when we purge the + # package, i.e. when we remove its conffiles in /etc/dbus-1/system.d/ + if [ -x /etc/init.d/dbus ]; then + invoke-rc.d dbus force-reload || true + fi + + if [ -x "$(command -v deluser)" ]; then + deluser --quiet --system haldaemon > /dev/null || true + else + echo >&2 "Not removing haldaemon system account because deluser command was not found" + fi + + rmdir /var/run/hal || true + + rm -f /var/cache/hald/fdi-cache + rmdir /var/cache/hald || true +fi + +exit 0 --- hal-0.5.10.orig/debian/compat +++ hal-0.5.10/debian/compat @@ -0,0 +1 @@ +5 --- hal-0.5.10.orig/debian/libhal1.install +++ hal-0.5.10/debian/libhal1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libhal.so.* --- hal-0.5.10.orig/debian/run-hald.sh +++ hal-0.5.10/debian/run-hald.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +cd hald +P="`pwd`" +export HALD_RUNNER_PATH=$P/linux:$P/linux/probing:$P/linux/addons:.:../tools:../tools/linux +export PATH=../hald-runner:$PATH +export HAL_FDI_SOURCE_PREPROBE=../fdi/preprobe +export HAL_FDI_SOURCE_INFORMATION=../fdi/information +export HAL_FDI_SOURCE_POLICY=../fdi/policy +./hald --daemon=no --verbose=yes + --- hal-0.5.10.orig/debian/libhal1.preinst +++ hal-0.5.10/debian/libhal1.preinst @@ -0,0 +1,11 @@ +#!/bin/sh -e + +# clean up doc directory symlinking from Gutsy +if [ "$1" = install ] || [ "$1" = upgrade ]; then + if dpkg --compare-versions "$2" lt-nl 0.5.10; then + for p in hal libhal-dev libhal-storage1 libhal-storage-dev; do + f=/usr/share/doc/$p + [ -e "$f" ] && rm -f $f || true + done + fi +fi --- hal-0.5.10.orig/debian/libhal1.shlibs +++ hal-0.5.10/debian/libhal1.shlibs @@ -0,0 +1 @@ +libhal 1 libhal1 (>= 0.5.10) --- hal-0.5.10.orig/debian/hal-doc.install +++ hal-0.5.10/debian/hal-doc.install @@ -0,0 +1,3 @@ +debian/tmp/usr/share/doc/hal-doc +debian/tmp/usr/share/gtk-doc/html/libhal usr/share/doc/hal-doc/api +debian/tmp/usr/share/gtk-doc/html/libhal-storage usr/share/doc/hal-doc/api --- hal-0.5.10.orig/debian/hal-doc.links +++ hal-0.5.10/debian/hal-doc.links @@ -0,0 +1,2 @@ +usr/share/doc/hal-doc/api/libhal usr/share/gtk-doc/html/libhal +usr/share/doc/hal-doc/api/libhal-storage usr/share/gtk-doc/html/libhal-storage --- hal-0.5.10.orig/debian/README.Debian +++ hal-0.5.10/debian/README.Debian @@ -0,0 +1,25 @@ + + The powermanagement callouts are in the default hal config + (org.freedesktop.Hal.Device.SystemPowerManagement and + org.freedesktop.Hal.Device.LaptopPanel) can be used by users in group + powerdev. The storage callouts (org.freedesktop.Hal.Device.Volume.*) can by + used by users in the group plugdev. + + The acpi addon won't use the kernel acpi events interface but the acpid's + event socket if acpid is installed. If acpid is removed, hal needs to be + restarted to enable monitoring of acpi events again. And if apci is installed, + hal needs a restart to free the kernels acpi events interface for acpid. + + + Some CD and DVD drives, such as the GDR8162B model found in some Dell + laptops, do not correctly handle media status inquiries and incorrectly + spin up the drive when they should not. Since hal regularly polls CD + drives for media changes, this results in increased power consumption and + mechanical wear and tear on such drives, which remain spinning constantly + while hal is running. + + If you have a CD/DVD drive exhibiting this problem, you can copy + /usr/share/doc/hal/examples/no-cd-media-check.fdi to /etc/hal/fdi/policy/ to + disable media checks for your drive. This file disables media checks for + all CD drives on the system, and also includes an example config for + disabling media checks only on a specific drive. --- hal-0.5.10.orig/debian/hal.links +++ hal-0.5.10/debian/hal.links @@ -0,0 +1 @@ +/usr/sbin/umount.hal sbin/umount.hal --- hal-0.5.10.orig/debian/hal.examples +++ hal-0.5.10/debian/hal.examples @@ -0,0 +1,2 @@ +debian/no-cd-media-check.fdi +fdi/policy/10osvendor/10-x11-input.fdi --- hal-0.5.10.orig/debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi +++ hal-0.5.10/debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi @@ -0,0 +1,13 @@ + + + + + + + + true + + + + + --- hal-0.5.10.orig/debian/patches/41_no_policy_validate.patch +++ hal-0.5.10/debian/patches/41_no_policy_validate.patch @@ -0,0 +1,29 @@ +diff --git a/configure b/configure +index ba74ffe..31c8ad2 100755 +--- a/configure ++++ b/configure +@@ -23258,9 +23258,8 @@ fi + + + if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then +- { { echo "$as_me:$LINENO: error: polkit-policy-file-validate not found" >&5 +-echo "$as_me: error: polkit-policy-file-validate not found" >&2;} +- { (exit 1); exit 1; }; } ++ { echo "$as_me:$LINENO: WARNING: polkit-policy-file-validate not found" >&5 ++echo "$as_me: WARNING: polkit-policy-file-validate not found" >&2;} + fi + fi + +diff --git a/configure.in b/configure.in +index d2b273f..d1bf03c 100644 +--- a/configure.in ++++ b/configure.in +@@ -527,7 +527,7 @@ if test "x$enable_policy_kit" != "xno"; then + AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE], + [polkit-policy-file-validate], [polkit-policy-file-validate]) + if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then +- AC_MSG_ERROR([polkit-policy-file-validate not found]) ++ AC_MSG_WARN([polkit-policy-file-validate not found]) + fi + fi + --- hal-0.5.10.orig/debian/patches/65_keyboard-addon-repeated.patch +++ hal-0.5.10/debian/patches/65_keyboard-addon-repeated.patch @@ -0,0 +1,12 @@ +diff -Nur hal-0.5.9/hald/linux/addons/addon-input.c hal-0.5.9.new/hald/linux/addons/addon-input.c +--- hal-0.5.9/hald/linux/addons/addon-input.c 2007-03-07 22:52:19.000000000 +0100 ++++ hal-0.5.9.new/hald/linux/addons/addon-input.c 2007-04-17 20:12:26.000000000 +0200 +@@ -244,7 +244,7 @@ + } + } + } +- } else if (input_data->event.type == EV_KEY && key_name[input_data->event.code] != NULL && input_data->event.value == 1) { ++ } else if (input_data->event.type == EV_KEY && key_name[input_data->event.code] != NULL && input_data->event.value) { + dbus_error_init (&error); + libhal_device_emit_condition (ctx, input_data->udi, + "ButtonPressed", --- hal-0.5.10.orig/debian/patches/71_realpath.patch +++ hal-0.5.10/debian/patches/71_realpath.patch @@ -0,0 +1,10 @@ +--- hal-0.5.10/tools/hal-disable-polling.c~ 2007-08-31 14:53:08.000000000 -0600 ++++ hal-0.5.10/tools/hal-disable-polling.c 2007-10-22 15:44:20.000000000 -0600 +@@ -28,6 +28,7 @@ + # include + #endif + ++#include + #include + #include + #include --- hal-0.5.10.orig/debian/patches/82_partutil_dont_deref_null.patch +++ hal-0.5.10/debian/patches/82_partutil_dont_deref_null.patch @@ -0,0 +1,105 @@ +commit 7f414a36784efa0dbef3a337518dc3cd3a1d7b4a +Author: Guillem Jover +Date: Tue Nov 20 15:00:29 2007 +0100 + + dereference pointer after checking it's not NULL + + Dereference pointer after checking it's not NULL in + partutil/partutil.c. + +diff --git a/partutil/partutil.c b/partutil/partutil.c +index 36078c0..b22f9b2 100644 +--- a/partutil/partutil.c ++++ b/partutil/partutil.c +@@ -928,11 +928,13 @@ char * + part_table_entry_get_type (PartitionTable *p, int entry) + { + char *s = NULL; +- PartitionEntry *pe = g_slist_nth_data (p->entries, entry); ++ PartitionEntry *pe; + + if (p == NULL) + goto out; + ++ pe = g_slist_nth_data (p->entries, entry); ++ + switch (p->scheme) { + case PART_TYPE_GPT: + s = get_le_guid (&(pe->data[0])); +@@ -959,11 +961,13 @@ char * + part_table_entry_get_uuid (PartitionTable *p, int entry) + { + char *s = NULL; +- PartitionEntry *pe = g_slist_nth_data (p->entries, entry); ++ PartitionEntry *pe; + + if (p == NULL) + goto out; + ++ pe = g_slist_nth_data (p->entries, entry); ++ + switch (p->scheme) { + case PART_TYPE_GPT: + s = get_le_guid (&(pe->data[16])); +@@ -982,11 +986,13 @@ char * + part_table_entry_get_label (PartitionTable *p, int entry) + { + char *s = NULL; +- PartitionEntry *pe = g_slist_nth_data (p->entries, entry); ++ PartitionEntry *pe; + + if (p == NULL) + goto out; + ++ pe = g_slist_nth_data (p->entries, entry); ++ + switch (p->scheme) { + case PART_TYPE_GPT: + s = g_utf16_to_utf8 ((const gunichar2 *) &(pe->data[56]), 36, NULL, NULL, NULL); +@@ -1012,11 +1018,13 @@ part_table_entry_get_flags (PartitionTable *p, int entry) + char **ss = NULL; + guint32 apm_status; + guint64 gpt_attributes; +- PartitionEntry *pe = g_slist_nth_data (p->entries, entry); ++ PartitionEntry *pe; + + if (p == NULL) + goto out; + ++ pe = g_slist_nth_data (p->entries, entry); ++ + ss = g_new0 (char*, 6 + 1); /* hard coded to max items we'll return */ + ss[0] = NULL; + n = 0; +@@ -1087,12 +1095,14 @@ guint64 + part_table_entry_get_offset (PartitionTable *p, int entry) + { + guint64 val; +- PartitionEntry *pe = g_slist_nth_data (p->entries, entry); ++ PartitionEntry *pe; + + val = G_MAXUINT64; + if (p == NULL) + goto out; + ++ pe = g_slist_nth_data (p->entries, entry); ++ + switch (p->scheme) { + case PART_TYPE_GPT: + val = 0x200 * ((guint64) get_le64 (pe->data + 32)); +@@ -1122,12 +1132,14 @@ guint64 + part_table_entry_get_size (PartitionTable *p, int entry) + { + guint64 val; +- PartitionEntry *pe = g_slist_nth_data (p->entries, entry); ++ PartitionEntry *pe; + + val = G_MAXUINT64; + if (p == NULL) + goto out; + ++ pe = g_slist_nth_data (p->entries, entry); ++ + switch (p->scheme) { + case PART_TYPE_GPT: + val = 0x200 * (((guint64) get_le64 (pe->data + 40)) - ((guint64) get_le64 (pe->data + 32)) + 1); --- hal-0.5.10.orig/debian/patches/80_fix_int_outof.patch +++ hal-0.5.10/debian/patches/80_fix_int_outof.patch @@ -0,0 +1,24 @@ +commit 4a75be3cee0cc71b694296bdc679ed0578fabf4a +Author: Frederic Crozat +Date: Mon Nov 5 19:44:14 2007 +0100 + + fix for int_outof + + I discovered a bug in int_outof implementation, which wasn't working + at all and I fixed it while discussing with David over IRC. + + But it seems my patch never got committed, Here it is + +diff --git a/hald/create_cache.c b/hald/create_cache.c +index 0250456..384ed6a 100644 +--- a/hald/create_cache.c ++++ b/hald/create_cache.c +@@ -142,7 +142,7 @@ get_match_type(const char *str) + if (strcmp (str, "contains_outof") == 0) + return MATCH_CONTAINS_OUTOF; + if (strcmp (str, "int_outof") == 0) +- return MATCH_CONTAINS_OUTOF; ++ return MATCH_INT_OUTOF; + if (strcmp (str, "prefix_outof") == 0) + return MATCH_PREFIX_OUTOF; + if (strcmp (str, "string_outof") == 0) --- hal-0.5.10.orig/debian/patches/01_hal_debian_dbuspolicy.patch +++ hal-0.5.10/debian/patches/01_hal_debian_dbuspolicy.patch @@ -0,0 +1,20 @@ +diff -aur hal-0.5.8.vanilla/hal.conf.in hal-0.5.8/hal.conf.in +--- hal-0.5.8.vanilla/hal.conf.in 2006-09-11 23:56:39.000000000 +0200 ++++ hal-0.5.8/hal.conf.in 2006-09-17 12:32:49.000000000 +0200 +@@ -54,6 +54,16 @@ + + + ++ ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + --- hal-0.5.10.orig/debian/patches/75_glist_memleak.patch +++ hal-0.5.10/debian/patches/75_glist_memleak.patch @@ -0,0 +1,72 @@ +commit 1491787fdf29fd77e4cbd13af70434ee3e7032ee +Author: Danny Kukawka +Date: Wed Oct 17 13:25:09 2007 +0200 + + fix GSList related memory leaks + + This fixes several memory leaks caused by not free'd GSList objects. + +diff --git a/hald/device_info.c b/hald/device_info.c +index 2b18346..438ec52 100644 +--- a/hald/device_info.c ++++ b/hald/device_info.c +@@ -621,6 +621,7 @@ handle_match (struct rule *rule, HalDevice *d) + break; + + } /* for all siblings */ ++ g_slist_free (siblings); + } + + return contains; +diff --git a/hald/linux/apm.c b/hald/linux/apm.c +index 11f56b9..79c54ad 100644 +--- a/hald/linux/apm.c ++++ b/hald/linux/apm.c +@@ -81,6 +81,7 @@ apm_poll (gpointer data) + apm_rescan_device (d); + } + ++ g_slist_free (devices); + return TRUE; + } + +diff --git a/hald/linux/hotplug.c b/hald/linux/hotplug.c +index d57a022..56db041 100644 +--- a/hald/linux/hotplug.c ++++ b/hald/linux/hotplug.c +@@ -409,6 +409,7 @@ hotplug_reprobe_generate_remove_events (HalDevice *d) + child = HAL_DEVICE (i->data); + hotplug_reprobe_generate_remove_events (child); + } ++ g_slist_free (childs); + + /* then remove self */ + HAL_INFO (("Generate remove event for udi %s", hal_device_get_udi (d))); +@@ -492,6 +493,7 @@ hotplug_reprobe_generate_add_events (HalDevice *d) + child = HAL_DEVICE (i->data); + hotplug_reprobe_generate_add_events (child); + } ++ g_slist_free (childs); + } + + gboolean +diff --git a/hald/linux/pmu.c b/hald/linux/pmu.c +index d8f6fc3..451ffac 100644 +--- a/hald/linux/pmu.c ++++ b/hald/linux/pmu.c +@@ -251,6 +251,7 @@ pmu_poll (gpointer data) + } + } + ++ g_slist_free (devices); + devices = hal_device_store_match_multiple_key_value_string (hald_get_gdl (), + "info.category", + "ac_adapter"); +@@ -266,6 +267,7 @@ pmu_poll (gpointer data) + } + } + ++ g_slist_free (devices); + return TRUE; + } + --- hal-0.5.10.orig/debian/patches/83_ssb_bus_support.patch +++ hal-0.5.10/debian/patches/83_ssb_bus_support.patch @@ -0,0 +1,69 @@ +diff -Nur -x '*.orig' -x '*~' ubuntu/hald/linux/device.c ubuntu.new/hald/linux/device.c +--- ubuntu/hald/linux/device.c 2007-10-09 19:46:59.000000000 +0200 ++++ ubuntu.new/hald/linux/device.c 2007-10-23 11:33:30.000000000 +0200 +@@ -2345,6 +2345,43 @@ + /*--------------------------------------------------------------------------------------------------------------*/ + + static HalDevice * ++ssb_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) ++{ ++ HalDevice *d; ++ ++ d = hal_device_new (); ++ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path); ++ hal_device_property_set_string (d, "linux.sysfs_path_device", sysfs_path); ++ hal_device_property_set_string (d, "info.bus", "ssb"); ++ if (parent_dev != NULL) { ++ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev)); ++ } else { ++ hal_device_property_set_string (d, "info.parent", "/org/freedesktop/Hal/devices/computer"); ++ } ++ ++ hal_util_set_driver (d, "info.linux.driver", sysfs_path); ++ ++ hal_device_property_set_string (d, "ssb.bus_id", ++ hal_util_get_last_element (sysfs_path)); ++ return d; ++} ++ ++static gboolean ++ssb_compute_udi (HalDevice *d) ++{ ++ gchar udi[256]; ++ ++ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi), ++ "/org/freedesktop/Hal/devices/ssb_%s", ++ hal_device_property_get_string (d, "xen.bus_id")); ++ hal_device_set_udi (d, udi); ++ hal_device_property_set_string (d, "info.udi", udi); ++ return TRUE; ++} ++ ++/*--------------------------------------------------------------------------------------------------------------*/ ++ ++static HalDevice * + ieee1394_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) + { + HalDevice *d; +@@ -3588,6 +3625,13 @@ + .remove = dev_remove + }; + ++static DevHandler dev_handler_ssb = { ++ .subsystem = "ssb", ++ .add = ssb_add, ++ .compute_udi = ssb_compute_udi, ++ .remove = dev_remove ++}; ++ + /* s390 specific busses */ + static DevHandler dev_handler_ccw = { + .subsystem = "ccw", +@@ -3650,6 +3694,7 @@ + &dev_handler_mmc, + &dev_handler_ieee1394, + &dev_handler_xen, ++ &dev_handler_ssb, + &dev_handler_ccw, + &dev_handler_ccwgroup, + &dev_handler_iucv, --- hal-0.5.10.orig/debian/patches/70_killswitch_dell.patch +++ hal-0.5.10/debian/patches/70_killswitch_dell.patch @@ -0,0 +1,111 @@ +commit 64e4ac8ff8570f315c6a99cdf6d221ba845dcf5a +Author: Danny Kukawka +Date: Mon Nov 12 19:48:59 2007 +0100 + + fix hal to work with libsmbios v0.13.12 + + Fixed HAL to work again with libsmbios v0.13.12 where the binaries + get moved from /usr/bin/ to /usr/sbin/. Needed to change some paths + in hal-system-killswitch-{g,s}et-power-linux to work with the new + and older versions correctly. + +diff --git a/tools/linux/hal-system-killswitch-get-power-linux b/tools/linux/hal-system-killswitch-get-power-linux +index f19d1f4..c24253f 100755 +--- a/tools/linux/hal-system-killswitch-get-power-linux ++++ b/tools/linux/hal-system-killswitch-get-power-linux +@@ -8,6 +8,13 @@ + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + ++if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then ++ DELL_WCTL=/usr/bin/dellWirelessCtl ++ if [ -x /usr/sbin/dellWirelessCtl ]; then ++ DELL_WCTL=/usr/sbin/dellWirelessCtl ++ fi ++fi ++ + if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then + if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then + value="`hal-system-sonypic getbluetooth`" +@@ -17,9 +24,9 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then + exit 1 + fi + exit ${value} +- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/bin/dellWirelessCtl ]; then ++ elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then + # TODO: write our own binary that links with libsmbios? +- /usr/bin/dellWirelessCtl --st_bt ++ $DELL_WCTL --st_bt + value=$? + if [ "$value" = "0" ]; then + exit 1 +@@ -35,9 +42,9 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then + exit 1 + fi + elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then +- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/bin/dellWirelessCtl ]; then ++ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then + # TODO: write our own binary that links with libsmbios? +- /usr/bin/dellWirelessCtl --st_wlan ++ $DELL_WCTL --st_wlan + value=$? + if [ "$value" = "0" ]; then + exit 1 +diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux +index 85a4548..2ef9ebe 100755 +--- a/tools/linux/hal-system-killswitch-set-power-linux ++++ b/tools/linux/hal-system-killswitch-set-power-linux +@@ -8,6 +8,13 @@ + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + ++if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then ++ DELL_WCTL=/usr/bin/dellWirelessCtl ++ if [ -x /usr/sbin/dellWirelessCtl ]; then ++ DELL_WCTL=/usr/sbin/dellWirelessCtl ++ fi ++fi ++ + if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then + if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "sonypic" ]; then + hal-system-sonypic setbluetooth $value +@@ -16,16 +23,16 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then + exit 1 + fi + exit 0 +- elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/bin/dellWirelessCtl ]; then ++ elif [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then + + # As a side effect we disable the physical kill switch + + # TODO: write our own binary that links with libsmbios? + if [ "$value" = "true" ]; then +- /usr/bin/dellWirelessCtl --sw_bt 0 --bt 1 ++ $DELL_WCTL --sw_bt 0 --bt 1 + ret=$? + else +- /usr/bin/dellWirelessCtl --sw_bt 0 --bt 0 ++ $DELL_WCTL --sw_bt 0 --bt 0 + ret=$? + fi + if [ "$ret" != "0" ]; then +@@ -38,16 +45,16 @@ if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then + exit 1 + fi + elif [ "$HAL_PROP_KILLSWITCH_TYPE" = "wlan" ]; then +- if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x /usr/bin/dellWirelessCtl ]; then ++ if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" -a -x $DELL_WCTL ]; then + + # As a side effect we disable the physical kill switch + + # TODO: write our own binary that links with libsmbios? + if [ "$value" = "true" ]; then +- /usr/bin/dellWirelessCtl --sw_wlan 0 --wlan 1 ++ $DELL_WCTL --sw_wlan 0 --wlan 1 + ret=$? + else +- /usr/bin/dellWirelessCtl --sw_wlan 0 --wlan 0 ++ $DELL_WCTL --sw_wlan 0 --wlan 0 + ret=$? + fi + if [ "$ret" != "0" ]; then --- hal-0.5.10.orig/debian/patches/84_memstick_bus_support.patch +++ hal-0.5.10/debian/patches/84_memstick_bus_support.patch @@ -0,0 +1,177 @@ +diff -Nur -x '*.orig' -x '*~' ubuntu/hald/linux/blockdev.c ubuntu.new/hald/linux/blockdev.c +--- ubuntu/hald/linux/blockdev.c 2007-08-14 20:24:10.000000000 +0200 ++++ ubuntu.new/hald/linux/blockdev.c 2007-10-23 11:44:30.000000000 +0200 +@@ -1161,6 +1161,12 @@ + is_hotpluggable = TRUE; + hal_device_property_set_string (d, "storage.bus", "mmc"); + break; ++ } else if (strcmp (bus, "memstick") == 0) { ++ physdev = d_it; ++ physdev_udi = udi_it; ++ is_hotpluggable = TRUE; ++ hal_device_property_set_string (d, "storage.bus", "memstick"); ++ break; + } else if (strcmp (bus, "ccw") == 0) { + physdev = d_it; + physdev_udi = udi_it; +@@ -1302,6 +1308,8 @@ + + } else if (strcmp (parent_bus, "mmc") == 0) { + hal_device_property_set_string (d, "storage.drive_type", "sd_mmc"); ++ } else if (strcmp (parent_bus, "memstick") == 0) { ++ hal_device_property_set_string (d, "storage.drive_type", "memstick"); + } + + hal_device_property_set_string (d, "info.category", "storage"); +diff -Nur -x '*.orig' -x '*~' ubuntu/hald/linux/device.c ubuntu.new/hald/linux/device.c +--- ubuntu/hald/linux/device.c 2007-10-23 11:44:20.000000000 +0200 ++++ ubuntu.new/hald/linux/device.c 2007-10-23 11:44:30.000000000 +0200 +@@ -1513,6 +1513,51 @@ + return TRUE; + } + ++ ++static HalDevice * ++memstick_host_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) ++{ ++ HalDevice *d; ++ gint host_num; ++ const gchar *last_elem; ++ ++ d = NULL; ++ ++ if (parent_dev == NULL || parent_path == NULL) { ++ goto out; ++ } ++ ++ d = hal_device_new (); ++ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path); ++ ++ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev)); ++ ++ hal_device_property_set_string (d, "info.category", "memstick_host"); ++ hal_device_add_capability (d, "memstick_host"); ++ ++ hal_device_property_set_string (d, "info.product", "Memory Stick Host Adapter"); ++ ++ last_elem = hal_util_get_last_element (sysfs_path); ++ sscanf (last_elem, "memstick%d", &host_num); ++ hal_device_property_set_int (d, "memstick_host.host", host_num); ++ ++out: ++ return d; ++} ++ ++static gboolean ++memstick_host_compute_udi (HalDevice *d) ++{ ++ gchar udi[256]; ++ ++ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi), ++ "%s_memstick_host", ++ hal_device_property_get_string (d, "info.parent")); ++ hal_device_set_udi (d, udi); ++ hal_device_property_set_string (d, "info.udi", udi); ++ return TRUE; ++} ++ + static HalDevice * + pci_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) + { +@@ -2280,6 +2325,49 @@ + + } + ++static HalDevice * ++memstick_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_dev, const gchar *parent_path) ++{ ++ HalDevice *d; ++ const gchar *bus_id; ++ ++ if (parent_dev == NULL) { ++ d = NULL; ++ goto out; ++ } ++ ++ d = hal_device_new (); ++ hal_device_property_set_string (d, "linux.sysfs_path", sysfs_path); ++ hal_device_property_set_string (d, "info.subsystem", "memstick"); ++ hal_device_property_set_string (d, "info.bus", "memstick"); ++ hal_device_property_set_string (d, "info.parent", hal_device_get_udi (parent_dev)); ++ ++ hal_util_set_driver (d, "info.linux.driver", sysfs_path); ++ ++ bus_id = hal_util_get_last_element (sysfs_path); ++ ++ hal_util_set_string_from_file (d, "info.product", sysfs_path, "attr_modelname"); ++ hal_util_set_string_from_file (d, "memstick.class", sysfs_path, "class"); ++ hal_util_set_string_from_file (d, "memstick.category", sysfs_path, "category"); ++ ++out: ++ return d; ++} ++ ++static gboolean ++memstick_compute_udi (HalDevice *d) ++{ ++ gchar udi[256]; ++ ++ hal_util_compute_udi (hald_get_gdl (), udi, sizeof (udi), ++ "%s_memstick_card", ++ hal_device_property_get_string (d, "info.parent")); ++ hal_device_set_udi (d, udi); ++ hal_device_property_set_string (d, "info.udi", udi); ++ return TRUE; ++ ++} ++ + /*--------------------------------------------------------------------------------------------------------------*/ + + static HalDevice * +@@ -3538,6 +3626,16 @@ + .remove = dev_remove + }; + ++static DevHandler dev_handler_memstick_host = ++{ ++ .subsystem = "memstick_host", ++ .add = memstick_host_add, ++ .get_prober = NULL, ++ .post_probing = NULL, ++ .compute_udi = memstick_host_compute_udi, ++ .remove = dev_remove ++}; ++ + static DevHandler dev_handler_pci = { + .subsystem = "pci", + .add = pci_add, +@@ -3601,6 +3699,13 @@ + .remove = dev_remove + }; + ++static DevHandler dev_handler_memstick = { ++ .subsystem = "memstick", ++ .add = memstick_add, ++ .compute_udi = memstick_compute_udi, ++ .remove = dev_remove ++}; ++ + static DevHandler dev_handler_ieee1394 = { + .subsystem = "ieee1394", + .add = ieee1394_add, +@@ -3692,6 +3797,7 @@ + &dev_handler_pcmcia, + &dev_handler_scsi, + &dev_handler_mmc, ++ &dev_handler_memstick, + &dev_handler_ieee1394, + &dev_handler_xen, + &dev_handler_ssb, +@@ -3712,6 +3818,7 @@ + &dev_handler_tape, + &dev_handler_tape390, + &dev_handler_mmc_host, ++ &dev_handler_memstick_host, + &dev_handler_backlight, + &dev_handler_firewire, + &dev_handler_power_supply, --- hal-0.5.10.orig/debian/patches/87_fix_hurd_compilation.patch +++ hal-0.5.10/debian/patches/87_fix_hurd_compilation.patch @@ -0,0 +1,107 @@ +commit 03ec951d17d8a7950083aa742f628b757e9110f3 +Author: Sjoerd Simons +Date: Sat Dec 8 21:38:36 2007 +0100 + + implement osspec_privileged_init in the dummy backend + + This added a noop osspec_privileged_init implementation for the dummy backend. + Patch by Samuel Thibault in Debian bug #444574 + +diff --git a/hald/dummy/osspec.c b/hald/dummy/osspec.c +index c4bc3c9..36ed07b 100644 +--- a/hald/dummy/osspec.c ++++ b/hald/dummy/osspec.c +@@ -38,6 +38,11 @@ + #include "../device_info.h" + + void ++osspec_privileged_init (void) ++{ ++} ++ ++void + osspec_init (void) + { + } +commit be950e548472c8b632cfc9d4b3a916fa3d49bb17 +Author: Sjoerd Simons +Date: Sat Dec 8 21:41:17 2007 +0100 + + get rid of PATH_MAX users to allow compilation on the Hurd + + This patch gets rid of all uses of PATH_MAX to allow compilation on the Hurd. + Based on a patch by Samuel Thibault in Debian bug #444574 + +diff --git a/hald/create_cache.c b/hald/create_cache.c +index c78c03f..37e2d10 100644 +--- a/hald/create_cache.c ++++ b/hald/create_cache.c +@@ -608,7 +608,7 @@ di_rules_init (void) + char * cachename; + int fd = -1; + struct cache_header header; +- char cachename_temp [PATH_MAX+1]; ++ gchar *cachename_temp; + char *hal_fdi_source_preprobe = getenv ("HAL_FDI_SOURCE_PREPROBE"); + char *hal_fdi_source_information = getenv ("HAL_FDI_SOURCE_INFORMATION"); + char *hal_fdi_source_policy = getenv ("HAL_FDI_SOURCE_POLICY"); +@@ -623,8 +623,7 @@ di_rules_init (void) + if (haldc_verbose) + HAL_INFO (("Loading rules")); + +- strncpy(cachename_temp, cachename, PATH_MAX); +- strncat(cachename_temp, "~", PATH_MAX); ++ cachename_temp = g_strconcat (cachename, "~", NULL); + + fd = open(cachename_temp, O_CREAT|O_RDWR|O_TRUNC, 0644); + if(fd < 0) { +@@ -681,9 +680,8 @@ di_rules_init (void) + pad32_write(fd, 0, &header, sizeof(struct cache_header)); + close(fd); + if (rename (cachename_temp, cachename) != 0) { +- unlink (cachename_temp); + HAL_ERROR (("Cannot rename '%s' to '%s': %s", cachename_temp, cachename, strerror (errno))); +- return -1; ++ goto error; + } + + if (haldc_verbose){ +@@ -703,6 +701,7 @@ error: + close (fd); + + unlink (cachename_temp); ++ g_free (cachename_temp); + return -1; + } + +diff --git a/hald/mmap_cache.c b/hald/mmap_cache.c +index be31429..db660a0 100644 +--- a/hald/mmap_cache.c ++++ b/hald/mmap_cache.c +@@ -179,7 +179,6 @@ dir_mtime (const char *path, time_t *mt, gboolean setup_watches) + struct dirent **namelist; + struct stat st; + int n; +- char cpath[PATH_MAX]; + + if (setup_watches) { + HalFileMonitor *file_monitor; +@@ -206,15 +205,13 @@ dir_mtime (const char *path, time_t *mt, gboolean setup_watches) + return; + else { + while(n--) { +-#ifdef HAVE_SNPRINTF +- snprintf(cpath, PATH_MAX, "%s/%s", path, namelist[n]->d_name); +-#else +- sprintf(cpath, "%s/%s", path, namelist[n]->d_name); +-#endif ++ gchar *cpath; ++ cpath = g_build_filename(path, namelist[n]->d_name, NULL); + if(namelist[n]->d_name[0] != '.') + dir_mtime(cpath, mt, setup_watches); + + free(namelist[n]); ++ g_free(cpath); + } + free(namelist); + } --- hal-0.5.10.orig/debian/patches/40_readme_remove_hacking.patch +++ hal-0.5.10/debian/patches/40_readme_remove_hacking.patch @@ -0,0 +1,12 @@ +diff -ruN hal-0.5.0-old/README hal-0.5.0/README +--- hal-0.5.0-old/README 2004-12-14 03:47:58.000000000 +0100 ++++ hal-0.5.0/README 2005-04-13 12:32:18.448771192 +0200 +@@ -2,8 +2,6 @@ + HAL is a hardware abstraction layer + + +-See also the file HACKING for notes of interest to developers working on HAL. +- + See http://www.freedesktop.org/Software/hal for lots of documentation, + mailing lists, etc. + --- hal-0.5.10.orig/debian/patches/86_fix_killswitch_callout.patch +++ hal-0.5.10/debian/patches/86_fix_killswitch_callout.patch @@ -0,0 +1,47 @@ +commit c573f7a5d3d6e8e7d3480ba45517a5cd3203c44c +Author: Sjoerd Simons +Date: Sat Dec 8 19:30:00 2007 +0100 + + always define DELL_WCTL + + This fixes errors from some shell when running the killswitch callouts + because DEL_WCTL is undefined when the killswitch access method is not dell. + +diff --git a/tools/linux/hal-system-killswitch-get-power-linux b/tools/linux/hal-system-killswitch-get-power-linux +index c24253f..5a1fb3f 100755 +--- a/tools/linux/hal-system-killswitch-get-power-linux ++++ b/tools/linux/hal-system-killswitch-get-power-linux +@@ -8,11 +8,9 @@ + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + +-if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then +- DELL_WCTL=/usr/bin/dellWirelessCtl +- if [ -x /usr/sbin/dellWirelessCtl ]; then +- DELL_WCTL=/usr/sbin/dellWirelessCtl +- fi ++DELL_WCTL=/usr/bin/dellWirelessCtl ++if [ -x /usr/sbin/dellWirelessCtl ]; then ++ DELL_WCTL=/usr/sbin/dellWirelessCtl + fi + + if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then +diff --git a/tools/linux/hal-system-killswitch-set-power-linux b/tools/linux/hal-system-killswitch-set-power-linux +index 2ef9ebe..4120c2d 100755 +--- a/tools/linux/hal-system-killswitch-set-power-linux ++++ b/tools/linux/hal-system-killswitch-set-power-linux +@@ -8,11 +8,9 @@ + # the Free Software Foundation; either version 2 of the License, or + # (at your option) any later version. + +-if [ "$HAL_PROP_KILLSWITCH_ACCESS_METHOD" = "dell" ]; then +- DELL_WCTL=/usr/bin/dellWirelessCtl +- if [ -x /usr/sbin/dellWirelessCtl ]; then +- DELL_WCTL=/usr/sbin/dellWirelessCtl +- fi ++DELL_WCTL=/usr/bin/dellWirelessCtl ++if [ -x /usr/sbin/dellWirelessCtl ]; then ++ DELL_WCTL=/usr/sbin/dellWirelessCtl + fi + + if [ "$HAL_PROP_KILLSWITCH_TYPE" = "bluetooth" ]; then --- hal-0.5.10.orig/debian/patches/80_allow_vfat_usefree.patch +++ hal-0.5.10/debian/patches/80_allow_vfat_usefree.patch @@ -0,0 +1,11 @@ +diff -Nur -x '*.orig' -x '*~' ubuntu/fdi/policy/10osvendor/20-storage-methods.fdi ubuntu.new/fdi/policy/10osvendor/20-storage-methods.fdi +--- ubuntu/fdi/policy/10osvendor/20-storage-methods.fdi 2007-08-27 17:34:05.000000000 +0200 ++++ ubuntu.new/fdi/policy/10osvendor/20-storage-methods.fdi 2007-10-23 11:18:49.000000000 +0200 +@@ -202,6 +202,7 @@ + fmask= + uid= + flush ++ usefree + + + longnames --- hal-0.5.10.orig/debian/patches/82_ignore_fixed_nonmedia.patch +++ hal-0.5.10/debian/patches/82_ignore_fixed_nonmedia.patch @@ -0,0 +1,25 @@ +diff -Nur -x '*.orig' -x '*~' ubuntu/fdi/policy/10osvendor/20-storage-methods.fdi ubuntu.new/fdi/policy/10osvendor/20-storage-methods.fdi +--- ubuntu/fdi/policy/10osvendor/20-storage-methods.fdi 2007-10-23 11:24:43.000000000 +0200 ++++ ubuntu.new/fdi/policy/10osvendor/20-storage-methods.fdi 2007-10-23 11:26:37.000000000 +0200 +@@ -155,6 +155,21 @@ + + + ++ ++ ++ ++ ++ true ++ ++ ++ ++ false ++ ++ ++ ++ ++ ++ + org.freedesktop.Hal.Device.Volume + + Mount --- hal-0.5.10.orig/debian/patches/85_read_brightness_not_actual_brightness.patch +++ hal-0.5.10/debian/patches/85_read_brightness_not_actual_brightness.patch @@ -0,0 +1,14 @@ +diff -Nur -x '*.orig' -x '*~' ubuntu/tools/linux/hal-system-lcd-get-brightness-linux ubuntu.new/tools/linux/hal-system-lcd-get-brightness-linux +--- ubuntu/tools/linux/hal-system-lcd-get-brightness-linux 2007-07-26 20:00:28.000000000 +0200 ++++ ubuntu.new/tools/linux/hal-system-lcd-get-brightness-linux 2007-10-23 11:48:27.000000000 +0200 +@@ -8,8 +8,8 @@ + # (at your option) any later version. + + # we have /sys/class/backlight +-if [ -r "$HAL_PROP_LINUX_SYSFS_PATH/actual_brightness" ]; then +- value="`cat $HAL_PROP_LINUX_SYSFS_PATH/actual_brightness`" ++if [ -r "$HAL_PROP_LINUX_SYSFS_PATH/brightness" ]; then ++ value="`cat $HAL_PROP_LINUX_SYSFS_PATH/brightness`" + exit ${value} + fi + --- hal-0.5.10.orig/debian/patches/23_addon_acpi.patch +++ hal-0.5.10/debian/patches/23_addon_acpi.patch @@ -0,0 +1,28 @@ +diff -aur hal-0.5.8.vanilla/hald/linux/addons/addon-acpi.c hal-0.5.8/hald/linux/addons/addon-acpi.c +--- hal-0.5.8.vanilla/hald/linux/addons/addon-acpi.c 2006-09-11 23:56:39.000000000 +0200 ++++ hal-0.5.8/hald/linux/addons/addon-acpi.c 2006-09-17 16:12:51.000000000 +0200 +@@ -32,6 +32,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -45,9 +46,14 @@ + acpi_get_event_fp_kernel (void) + { + FILE *fp = NULL; ++ struct stat sbuf; + +- fp = fopen ("/proc/acpi/event", "r"); ++ if (stat("/usr/sbin/acpid", &sbuf) == 0) { ++ HAL_DEBUG (("acpid installed, not using the kernel acpi event interface")); ++ return NULL; ++ } + ++ fp = fopen ("/proc/acpi/event", "r"); + if (fp == NULL) + HAL_ERROR (("Cannot open /proc/acpi/event: %s", strerror (errno))); + +Only in hal-0.5.8/hald/linux/addons: addon-acpi.c.orig --- hal-0.5.10.orig/debian/patches/68_alternative-cdrw-capacity-detection.patch +++ hal-0.5.10/debian/patches/68_alternative-cdrw-capacity-detection.patch @@ -0,0 +1,192 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 68_disc_identification.dpatch by +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Added get_mmc_profile to recognise discs in old drives (where GET +## DP: CONFIGURATION fails), called from get_disc_type. + +@DPATCH@ + +diff -Nru hal-0.5.9.orig/hald/linux/probing/linux_dvd_rw_utils.c hal-0.5.9/hald/linux/probing/linux_dvd_rw_utils.c +--- hal-0.5.9.orig/hald/linux/probing/linux_dvd_rw_utils.c 2007-03-07 21:52:19.000000000 +0000 ++++ hal-0.5.9/hald/linux/probing/linux_dvd_rw_utils.c 2007-07-31 19:23:36.000000000 +0100 +@@ -740,6 +740,160 @@ + return retval; + } + ++ ++static int ++get_mmc_profile (int fd, int * isblank) ++{ ++ ScsiCommand * cmd; ++ int retval = -1; ++ unsigned char formats[260],disc_info[32]; ++ unsigned char page[20]; ++ unsigned char buf[8],inq[128]; ++ int profile=0,once=1,blank=0,err,erasable=0; ++ unsigned int len; ++ ++ cmd = scsi_command_new_from_fd (fd); ++ ++ /* For valgrind */ ++ memset (&page, 0, sizeof (page)); ++ memset (&buf, 0, sizeof (buf)); ++ memset (&inq, 0, sizeof (inq)); ++ memset (&disc_info, 0, sizeof (disc_info)); ++ memset (&formats, 0, sizeof (formats)); ++ ++ /* ++ INQUIRY is considered to be "non-intrusive" in a sense that it ++ won't interfere with any other operation nor clear sense data, ++ which might be important to retain for security reasons. ++ */ ++ ++ scsi_command_init(cmd,0,0x12); /* INQUIRY */ ++ scsi_command_init(cmd,4,36); ++ scsi_command_init(cmd,5,0); ++ if ((err=scsi_command_transport(cmd,READ,inq,36))) { ++ /*sperror ("INQUIRY",err);*/ ++ goto bail; ++ } ++ ++ /* make sure we're talking to MMC unit, for security reasons... */ ++ if ((inq[0]&0x1F) != 5) { ++ fprintf (stderr, "Could not determine drive profile: not an MMC unit!\n"); ++ goto bail; ++ } ++ ++ do { ++ scsi_command_init(cmd,0,0x46); ++ scsi_command_init(cmd,8,sizeof(buf)); ++ scsi_command_init(cmd,9,0); ++ if ((err=scsi_command_transport(cmd,READ,buf,sizeof(buf)))) { ++ /*sperror ("GET CONFIGURATION",err);*/ ++ /* this is not a fatal error -- some older drives support MMC-1 ++ * but don't support the GET CONFIGURATION command (which is part ++ * of the MMC-2 spec). */ ++ } else { ++ if ((profile = buf[6]<<8|buf[7]) || !once) break; ++ } ++ ++ // no media? ++ scsi_command_init(cmd,0,0); // TEST UNIT READY ++ scsi_command_init(cmd,5,0); ++ if ((scsi_command_transport(cmd,READ,buf,sizeof(buf))&0xFFF00) != 0x23A00) break; ++ ++ // try to load tray... ++ scsi_command_init(cmd,0,0x1B); // START/STOP UNIT ++ scsi_command_init(cmd,4,0x3); // "Load" ++ scsi_command_init(cmd,5,0); ++ if ((err=scsi_command_transport(cmd,READ,buf,sizeof(buf)))) { ++ /*sperror ("LOAD TRAY",err);*/ ++ fprintf (stderr, "Could not determine drive profile: Error loading drive tray\n"); ++ goto bail; ++ } ++ ++ /* wait_for_unit (cmd);*/ ++ } while (once--); ++ ++ scsi_command_init(cmd,0,0x51); // READ DISC INFORMATION ++ scsi_command_init(cmd,8,sizeof(disc_info)); ++ scsi_command_init(cmd,9,0); ++ if ((err=scsi_command_transport(cmd,READ,disc_info,sizeof(disc_info)))) { ++ /*sperror ("READ DISC INFORMATION",err);*/ ++ fprintf (stderr, "Could not fully determine drive profile %x: Error reading disc information\n", profile); ++ goto bail; ++ } ++ ++ // see if it's blank media ++ if ((disc_info[2]&3) == 0) blank=1; ++ ++ if (!profile ) { ++ /* if the profile has not yet been set, we're dealing with an older ++ * CD-R or CD-RW burner (which doesn't know the GET CONFIGURATION ++ * command. Do some digging into the disc type to figure out what's ++ * in the drive */ ++ erasable = ((disc_info[2] & 16)); ++ if (blank && !erasable) { ++ profile = 0x09; /* CD-R */ ++ } else if (erasable) { ++ profile = 0x0a; /* CD-RW */ ++ } else if (disc_info[8] == 0x00) { ++ profile = 0x08; /* Commercial CDs and Audio CD */ ++ } else { ++ fprintf (stderr, "Could not determine profile or type of media\n"); ++ goto bail; ++ } ++ } ++ ++ if ((profile != 0x1A && profile != 0x13 && profile != 0x12)) { ++ retval = profile; ++ } ++ else { ++ scsi_command_init(cmd,0,0x23); // READ FORMAT CAPACITIES ++ scsi_command_init(cmd,8,12); ++ scsi_command_init(cmd,9,0); ++ if ((err=scsi_command_transport(cmd,READ,formats,12))) { ++ /*sperror ("READ FORMAT CAPACITIES",err);*/ ++ fprintf (stderr, "Could not determine drive profile: " ++ "Error reading format capacities\n"); ++ goto bail; ++ } ++ ++ len = formats[3]; ++ if (len&7 || len<16) { ++ fprintf (stderr, "Could not determine drive profile: " ++ "Format allocation length isn't sane\n"); ++ goto bail; ++ } ++ ++ scsi_command_init(cmd,0,0x23); // READ FORMAT CAPACITIES ++ scsi_command_init(cmd,7,(4+len)>>8); ++ scsi_command_init(cmd,8,(4+len)&0xFF); ++ scsi_command_init(cmd,9,0); ++ if ((err=scsi_command_transport(cmd,READ,formats,4+len))) { ++ /*sperror ("READ FORMAT CAPACITIES",err);*/ ++ fprintf (stderr, "Could not determine drive profile: " ++ "Error reading format capacities (2)\n"); ++ goto bail; ++ } ++ ++ if (len != formats[3]) { ++ fprintf (stderr, "Could not determine drive profile: " ++ "parameter length inconsistency\n"); ++ goto bail; ++ } ++ ++ // see if it's not formatted ++ if ((formats[8]&3) != 2) blank = 1; ++ ++ retval = profile; ++ } ++ ++ /* Only touch isblank if we have read the profile correctly. */ ++ if ( retval != -1 ) { ++ *isblank = blank; ++ } ++bail: ++ return retval; ++} ++ + int + get_disc_type (int fd) + { +@@ -754,14 +908,16 @@ + scsi_command_init (cmd, 8, 8); + scsi_command_init (cmd, 9, 0); + if (scsi_command_transport (cmd, READ, header, 8)) { ++ int isblank; + /* GET CONFIGURATION failed */ + scsi_command_free (cmd); +- return -1; ++ /* Try alternative method */ ++ retval = get_mmc_profile(fd,&isblank); ++ return retval; /* get_mmc_profile returns -1 on error too. */ + } + + retval = (header[6]<<8)|(header[7]); + +- + scsi_command_free (cmd); + return retval; + } --- hal-0.5.10.orig/debian/patches/84_fix_uninitialised_memory_usage_in_pci_add.patch +++ hal-0.5.10/debian/patches/84_fix_uninitialised_memory_usage_in_pci_add.patch @@ -0,0 +1,34 @@ +>From e253734c381bcc5c09c2122ed434fa1df5bcdd1a Mon Sep 17 00:00:00 2001 +From: Rob Taylor +Date: Thu, 8 Nov 2007 23:51:47 +0000 +Subject: [PATCH] fix uninitialised memory usage in pci_add +To: hal + +pci_add was using vendor_name, product_name, subsys_vendor_name and +subsys_product_name unitialised, causing random crashes and garbage output. +--- + hald/linux/device.c | 8 ++++---- + 1 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/hald/linux/device.c b/hald/linux/device.c +index 7111629..32063bd 100644 +--- a/hald/linux/device.c ++++ b/hald/linux/device.c +@@ -1551,10 +1551,10 @@ pci_add (const gchar *sysfs_path, const gchar *device_file, HalDevice *parent_de + + { + gchar buf[64]; +- char *vendor_name; +- char *product_name; +- char *subsys_vendor_name; +- char *subsys_product_name; ++ char *vendor_name = NULL; ++ char *product_name = NULL; ++ char *subsys_vendor_name = NULL; ++ char *subsys_product_name = NULL; + + ids_find_pci (hal_device_property_get_int (d, "pci.vendor_id"), + hal_device_property_get_int (d, "pci.product_id"), +-- +1.5.3.GIT + --- hal-0.5.10.orig/debian/patches/83_crash_if_singleton_hashtable_is_null.patch +++ hal-0.5.10/debian/patches/83_crash_if_singleton_hashtable_is_null.patch @@ -0,0 +1,28 @@ +commit 1f2b6056107295031c3a425bc0aac76d11e56bea +Author: Danny Kukawka +Date: Fri Nov 23 16:57:58 2007 +0100 + + fix possible segfault if singletons is NULL + + Fixed segfault if the singletons Hashtable is NULL. This should + fix fd.o bug 11767 and 12287. + +diff --git a/hald/hald_dbus.c b/hald/hald_dbus.c +index 091cc89..ae37d9d 100644 +--- a/hald/hald_dbus.c ++++ b/hald/hald_dbus.c +@@ -5200,8 +5200,12 @@ local_server_message_handler (DBusConnection *connection, + helper_interface_handlers = g_slist_remove_link (helper_interface_handlers, i); + } + } +- +- g_hash_table_foreach_remove (singletons, (GHRFunc) singleton_remove_by_connection, connection); ++ ++ if (G_UNLIKELY (!singletons)) { ++ HAL_ERROR (("Singleton table is not initialied/ is NULL")); ++ } else { ++ g_hash_table_foreach_remove (singletons, (GHRFunc) singleton_remove_by_connection, connection); ++ } + + dbus_connection_unref (connection); + return DBUS_HANDLER_RESULT_HANDLED; --- hal-0.5.10.orig/debian/patches/28_runner_64bit_values.patch +++ hal-0.5.10/debian/patches/28_runner_64bit_values.patch @@ -0,0 +1,34 @@ +diff --git a/hald-runner/main.c b/hald-runner/main.c +index 3b170b3..3842cb8 100644 +--- a/hald-runner/main.c ++++ b/hald-runner/main.c +@@ -128,9 +128,10 @@ handle_start(DBusConnection *con, DBusMessage *msg) + goto malformed; + + if (run_request_run(r, con, NULL, &pid)) { ++ gint64 ppid = pid; + reply = dbus_message_new_method_return(msg); + dbus_message_append_args (reply, +- DBUS_TYPE_INT64, &pid, ++ DBUS_TYPE_INT64, &ppid, + DBUS_TYPE_INVALID); + + } else { +diff --git a/hald-runner/runner.c b/hald-runner/runner.c +index 57a2a80..8cbc777 100644 +--- a/hald-runner/runner.c ++++ b/hald-runner/runner.c +@@ -175,11 +175,12 @@ out: + /* emit a signal that this PID exited */ + if(rd->con != NULL && rd->emit_pid_exited) { + DBusMessage *signal; ++ gint64 ppid = rd->pid; + signal = dbus_message_new_signal ("/org/freedesktop/HalRunner", + "org.freedesktop.HalRunner", + "StartedProcessExited"); + dbus_message_append_args (signal, +- DBUS_TYPE_INT64, &(rd->pid), ++ DBUS_TYPE_INT64, &(ppid), + DBUS_TYPE_INVALID); + dbus_connection_send(rd->con, signal, NULL); + } --- hal-0.5.10.orig/debian/patches/85_fix_strlist_to_string.patch +++ hal-0.5.10/debian/patches/85_fix_strlist_to_string.patch @@ -0,0 +1,55 @@ +commit 533e321c80db8a29fa562c498c8c0199d61cf039 +Author: Sjoerd Simons +Date: Sun Dec 2 22:17:27 2007 +0100 + + use GString to convert a strlist propery to string instead of a static buffer + + Instead of a static 256 chars buffer use a GString when converting strlist + properties to string. This prevents clipping the list. + + Also fixes a hal crash because the old code didn't do a proper \0 terminate + when the string overflowed (strncpy is a very nice function *cough*). + Eventually the string containing garbage would be passed over dbus to the + runner which would disconnect from the private bus. + +diff --git a/hald/device.c b/hald/device.c +index 9514c9d..a3b84f4 100644 +--- a/hald/device.c ++++ b/hald/device.c +@@ -160,28 +160,19 @@ hal_property_to_string (HalProperty *prop) + case HAL_PROPERTY_TYPE_STRLIST: + { + GSList *iter; +- guint i; +- char buf[256]; ++ GString *buf; ++ ++ buf = g_string_new (""); + +- i = 0; +- buf[0] = '\0'; +- for (iter = hal_property_get_strlist (prop); +- iter != NULL && i < sizeof(buf); ++ for (iter = hal_property_get_strlist (prop); iter != NULL; + iter = g_slist_next (iter)) { +- guint len; +- const char *str; +- +- str = (const char *) iter->data; +- len = strlen (str); +- strncpy (buf + i, str, sizeof(buf) - i); +- i += len; ++ g_string_append (buf, (const char *) iter->data); + +- if (g_slist_next (iter) != NULL && i < sizeof(buf)) { +- buf[i] = '\t'; +- i++; ++ if (g_slist_next (iter) != NULL) { ++ g_string_append_c(buf, '\t'); + } + } +- return g_strdup (buf); ++ return g_string_free (buf, FALSE); + } + + default: --- hal-0.5.10.orig/debian/patches/86_allow_ufs_ufstype.patch +++ hal-0.5.10/debian/patches/86_allow_ufs_ufstype.patch @@ -0,0 +1,17 @@ +diff -Nur -x '*.orig' -x '*~' ubuntu/fdi/policy/10osvendor/20-storage-methods.fdi ubuntu.new/fdi/policy/10osvendor/20-storage-methods.fdi +--- ubuntu/fdi/policy/10osvendor/20-storage-methods.fdi 2007-10-23 12:33:31.000000000 +0200 ++++ ubuntu.new/fdi/policy/10osvendor/20-storage-methods.fdi 2007-10-23 12:33:46.000000000 +0200 +@@ -278,6 +278,13 @@ + user_xattr + + ++ ++ ++ ++ ufstype= ++ ++ ++ + + + --- hal-0.5.10.orig/debian/patches/81_dont_deref_reason_why_locked_if_null.patch +++ hal-0.5.10/debian/patches/81_dont_deref_reason_why_locked_if_null.patch @@ -0,0 +1,22 @@ +commit 522f8bede85239dc0279a94d0b1e9c1da4e601f6 +Author: Guillem Jover +Date: Tue Nov 20 14:50:43 2007 +0100 + + libhal: do not dereference *reason_why_locked if it's NULL + + Do not dereference *reason_why_locked if it's NULL after call + dbus_malloc0(). + +diff --git a/libhal/libhal.c b/libhal/libhal.c +index 619b7a5..2697239 100644 +--- a/libhal/libhal.c ++++ b/libhal/libhal.c +@@ -2279,6 +2279,8 @@ libhal_device_lock (LibHalContext *ctx, + if (reason_why_locked != NULL) { + *reason_why_locked = + dbus_malloc0 (strlen (error->message) + 1); ++ if (*reason_why_locked == NULL) ++ return FALSE; + strcpy (*reason_why_locked, error->message); + } + } --- hal-0.5.10.orig/debian/patches/81_ignore_single_slash_label.patch +++ hal-0.5.10/debian/patches/81_ignore_single_slash_label.patch @@ -0,0 +1,12 @@ +diff -Nur hal/build-tree/hal-0.5.8.1/tools/hal-storage-mount.c hal.new/build-tree/hal-0.5.8.1/tools/hal-storage-mount.c +--- hal-0.5.8.1/tools/hal-storage-mount.c 2007-03-09 18:13:01.000000000 +0100 ++++ hal-0.5.8.1/tools/hal-storage-mount.c 2007-03-09 18:19:42.000000000 +0100 +@@ -591,7 +591,7 @@ + else + label = NULL; + +- if (label != NULL) { ++ if (label != NULL && strcmp(label, "/") != 0) { + /* best - use label */ + g_strlcpy (mount_point, label, sizeof (mount_point)); + --- hal-0.5.10.orig/debian/copyright +++ hal-0.5.10/debian/copyright @@ -0,0 +1,232 @@ +This package was debianized by Martin Waitz on +Fri, 24 Oct 2003 22:54:43 +0200. + +It was downloaded from www.freedesktop.org + +Upstream Author: David Zeuthen + +Copyright: + +HAL is licensed to you under your choice of the Academic Free +License version 2.0, 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. + + The Academic Free License + v. 2.0 + +This Academic Free License (the "License") applies to any original +work of authorship (the "Original Work") whose owner (the "Licensor") +has placed the following notice immediately following the copyright +notice for the Original Work: + +Licensed under the Academic Free License version 2.0 + +1) Grant of Copyright License. Licensor hereby grants You a +world-wide, royalty-free, non-exclusive, perpetual, sublicenseable +license to do the following: + +a) to reproduce the Original Work in copies; + +b) to prepare derivative works ("Derivative Works") based upon the Original Work; + +c) to distribute copies of the Original Work and Derivative Works to the public; + +d) to perform the Original Work publicly; and + +e) to display the Original Work publicly. + +2) Grant of Patent License. Licensor hereby grants You a world-wide, +royalty-free, non-exclusive, perpetual, sublicenseable license, under +patent claims owned or controlled by the Licensor that are embodied in +the Original Work as furnished by the Licensor, to make, use, sell and +offer for sale the Original Work and Derivative Works. + +3) Grant of Source Code License. The term "Source Code" means the +preferred form of the Original Work for making modifications to it and +all available documentation describing how to modify the Original +Work. Licensor hereby agrees to provide a machine-readable copy of +the Source Code of the Original Work along with each copy of the +Original Work that Licensor distributes. Licensor reserves the right +to satisfy this obligation by placing a machine-readable copy of the +Source Code in an information repository reasonably calculated to +permit inexpensive and convenient access by You for as long as +Licensor continues to distribute the Original Work, and by publishing +the address of that information repository in a notice immediately +following the copyright notice that applies to the Original Work. + +4) Exclusions From License Grant. Neither the names of Licensor, nor +the names of any contributors to the Original Work, nor any of their +trademarks or service marks, may be used to endorse or promote +products derived from this Original Work without express prior written +permission of the Licensor. Nothing in this License shall be deemed +to grant any rights to trademarks, copyrights, patents, trade secrets +or any other intellectual property of Licensor except as expressly +stated herein. No patent license is granted to make, use, sell or +offer to sell embodiments of any patent claims other than the licensed +claims defined in Section 2. No right is granted to the trademarks of +Licensor even if such marks are included in the Original Work. +Nothing in this License shall be interpreted to prohibit Licensor from +licensing under different terms from this License any Original Work +that Licensor otherwise would have a right to license. + +5) This section intentionally omitted. + +6) Attribution Rights. You must retain, in the Source Code of any +Derivative Works that You create, all copyright, patent or trademark +notices from the Source Code of the Original Work, as well as any +notices of licensing and any descriptive text identified therein as an +"Attribution Notice." You must cause the Source Code for any +Derivative Works that You create to carry a prominent Attribution +Notice reasonably calculated to inform recipients that You have +modified the Original Work. + +7) Warranty of Provenance and Disclaimer of Warranty. Licensor +warrants that the copyright in and to the Original Work and the patent +rights granted herein by Licensor are owned by the Licensor or are +sublicensed to You under the terms of this License with the permission +of the contributor(s) of those copyrights and patent rights. Except +as expressly stated in the immediately proceeding sentence, the +Original Work is provided under this License on an "AS IS" BASIS and +WITHOUT WARRANTY, either express or implied, including, without +limitation, the warranties of NON-INFRINGEMENT, MERCHANTABILITY or +FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS TO THE QUALITY +OF THE ORIGINAL WORK IS WITH YOU. This DISCLAIMER OF WARRANTY +constitutes an essential part of this License. No license to Original +Work is granted hereunder except under this disclaimer. + +8) Limitation of Liability. Under no circumstances and under no legal +theory, whether in tort (including negligence), contract, or +otherwise, shall the Licensor be liable to any person for any direct, +indirect, special, incidental, or consequential damages of any +character arising as a result of this License or the use of the +Original Work including, without limitation, damages for loss of +goodwill, work stoppage, computer failure or malfunction, or any and +all other commercial damages or losses. This limitation of liability +shall not apply to liability for death or personal injury resulting +from Licensor's negligence to the extent applicable law prohibits such +limitation. Some jurisdictions do not allow the exclusion or +limitation of incidental or consequential damages, so this exclusion +and limitation may not apply to You. + +9) Acceptance and Termination. If You distribute copies of the +Original Work or a Derivative Work, You must make a reasonable effort +under the circumstances to obtain the express assent of recipients to +the terms of this License. Nothing else but this License (or another +written agreement between Licensor and You) grants You permission to +create Derivative Works based upon the Original Work or to exercise +any of the rights granted in Section 1 herein, and any attempt to do +so except under the terms of this License (or another written +agreement between Licensor and You) is expressly prohibited by +U.S. copyright law, the equivalent laws of other countries, and by +international treaty. Therefore, by exercising any of the rights +granted to You in Section 1 herein, You indicate Your acceptance of +this License and all of its terms and conditions. + +10) Termination for Patent Action. This License shall terminate +automatically and You may no longer exercise any of the rights granted +to You by this License as of the date You commence an action, +including a cross-claim or counterclaim, for patent infringement (i) +against Licensor with respect to a patent applicable to software or +(ii) against any entity with respect to a patent applicable to the +Original Work (but excluding combinations of the Original Work with +other software or hardware). + +11) Jurisdiction, Venue and Governing Law. Any action or suit relating +to this License may be brought only in the courts of a jurisdiction +wherein the Licensor resides or in which Licensor conducts its primary +business, and under the laws of that jurisdiction excluding its +conflict-of-law provisions. The application of the United Nations +Convention on Contracts for the International Sale of Goods is +expressly excluded. Any use of the Original Work outside the scope of +this License or after its termination shall be subject to the +requirements and penalties of the U.S. Copyright Act, 17 U.S.C. \u00a4 +101 et seq., the equivalent laws of other countries, and international +treaty. This section shall survive the termination of this License. + +12) Attorneys Fees. In any action to enforce the terms of this License +or seeking damages relating thereto, the prevailing party shall be +entitled to recover its costs and expenses, including, without +limitation, reasonable attorneys' fees and costs incurred in +connection with such action, including any appeal of such action. +This section shall survive the termination of this License. + +13) Miscellaneous. This License represents the complete agreement +concerning the subject matter hereof. If any provision of this +License is held to be unenforceable, such provision shall be reformed +only to the extent necessary to make it enforceable. + +14) Definition of "You" in This License. "You" throughout this +License, whether in upper or lower case, means an individual or a +legal entity exercising rights under, and complying with all of the +terms of, this License. For legal entities, "You" includes any entity +that controls, is controlled by, or is under common control with you. +For purposes of this definition, "control" means (i) the power, direct +or indirect, to cause the direction or management of such entity, +whether by contract or otherwise, or (ii) ownership of fifty percent +(50%) or more of the outstanding shares, or (iii) beneficial ownership +of such entity. + +15) Right to Use. You may use the Original Work in all ways not +otherwise restricted or conditioned by this License or by law, and +Licensor promises not to interfere with or be responsible for such +uses by You. + +This license is Copyright (C) 2003 Lawrence E. Rosen. All rights +reserved. Permission is hereby granted to copy and distribute this +license without modification. This license may not be modified +without the express written permission of its copyright owner. + +-- +END OF ACADEMIC FREE LICENSE. The following is intended to describe the essential +differences between the Academic Free License (AFL) version 1.0 and other +open source licenses: + +The Academic Free License is similar to the BSD, MIT, UoI/NCSA and Apache +licenses in many respects but it is intended to solve a few problems with +those licenses. + +* The AFL is written so as to make it clear what software is being +licensed (by the inclusion of a statement following the copyright notice +in the software). This way, the license functions better than a template +license. The BSD, MIT and UoI/NCSA licenses apply to unidentified software. + +* The AFL contains a complete copyright grant to the software. The BSD +and Apache licenses are vague and incomplete in that respect. + +* The AFL contains a complete patent grant to the software. The BSD, MIT, +UoI/NCSA and Apache licenses rely on an implied patent license and contain +no explicit patent grant. + +* The AFL makes it clear that no trademark rights are granted to the +licensor's trademarks. The Apache license contains such a provision, but the +BSD, MIT and UoI/NCSA licenses do not. + +* The AFL includes the warranty by the licensor that it either owns the +copyright or that it is distributing the software under a license. None of +the other licenses contain that warranty. All other warranties are disclaimed, +as is the case for the other licenses. + +* The AFL is itself copyrighted (with the right granted to copy and distribute +without modification). This ensures that the owner of the copyright to the +license will control changes. The Apache license contains a copyright notice, +but the BSD, MIT and UoI/NCSA licenses do not. + + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + +A copy of the GPL is available in /usr/share/common-licenses/GPL --- hal-0.5.10.orig/debian/preferences.fdi +++ hal-0.5.10/debian/preferences.fdi @@ -0,0 +1,59 @@ + + + + + + + + + + false + + + + + + + + + + --- hal-0.5.10.orig/debian/hal.udev.rules +++ hal-0.5.10/debian/hal.udev.rules @@ -0,0 +1,2 @@ +# Have udev pass data over a socket to hal +RUN+="socket:/org/freedesktop/hal/udev_event" --- hal-0.5.10.orig/debian/libhal-storage-dev.install +++ hal-0.5.10/debian/libhal-storage-dev.install @@ -0,0 +1,4 @@ +debian/tmp/usr/include/hal/libhal-storage.h +debian/tmp/usr/lib/pkgconfig/hal-storage.pc +debian/tmp/usr/lib/libhal-storage.so +debian/tmp/usr/lib/libhal-storage.a --- hal-0.5.10.orig/debian/libhal-storage1.shlibs +++ hal-0.5.10/debian/libhal-storage1.shlibs @@ -0,0 +1 @@ +libhal-storage 1 libhal-storage1 (>= 0.5.10) --- hal-0.5.10.orig/debian/hal.install +++ hal-0.5.10/debian/hal.install @@ -0,0 +1,19 @@ +debian/tmp/etc/ +debian/tmp/usr/bin/lshal +debian/tmp/usr/bin/hal-device +debian/tmp/usr/bin/hal-get-property +debian/tmp/usr/bin/hal-set-property +debian/tmp/usr/bin/hal-find-by-capability +debian/tmp/usr/bin/hal-find-by-property +debian/tmp/usr/bin/hal-disable-polling +debian/tmp/usr/bin/hal-is-caller-locked-out +debian/tmp/usr/bin/hal-is-caller-privileged +debian/tmp/usr/bin/hal-lock +debian/tmp/usr/bin/hal-setup-keymap +debian/tmp/usr/sbin/ +debian/tmp/sbin/umount.hal usr/sbin +debian/tmp/usr/lib/hal/ +debian/tmp/usr/share/hal/fdi/ +debian/tmp/usr/share/PolicyKit/ +debian/preferences.fdi etc/hal/fdi/policy +debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi usr/share/hal/fdi/policy/10osvendor