--- hal-0.5.7.1.orig/hal-0.5.7.1.tar.gz.cdbs-config_list +++ hal-0.5.7.1/hal-0.5.7.1.tar.gz.cdbs-config_list @@ -0,0 +1,3 @@ +hal-0.5.7.1/config.h.in +hal-0.5.7.1/config.guess +hal-0.5.7.1/config.sub --- hal-0.5.7.1.orig/debian/control +++ hal-0.5.7.1/debian/control @@ -0,0 +1,116 @@ +Source: hal +Section: admin +Priority: optional +Maintainer: Sjoerd Simons +Build-Depends: debhelper (>= 5.0.37.2), cdbs, python-central (>= 0.4.17), python, python2.4, python2.4-dbus, libdbus-glib-1-dev (>= 0.60), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, libcap-dev, doxygen, intltool (>= 0.22), libusb-dev, sharutils +Standards-Version: 3.6.1.0 +XS-Python-Version: 2.4 + +Package: hal +Architecture: any +Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.065), dbus (>= 0.60-1), lsb-base, pmount +Suggests: hal-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-device-manager +Architecture: all +Depends: ${shlibs:Depends}, ${python:Depends}, python-dbus, python-gnome2, python-glade2, hal, python-launchpad-integration, hwdb-client-gnome +Conflicts: hal (<< 0.5) +XB-Python-Version: ${python:Versions} +Description: Hardware Abstraction Layer user interface + 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 provides a user interface which shows the information HAL knows + about the devices on the system. + +Package: hal-doc +Architecture: all +Section: doc +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. + . + 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 (= ${Source-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 (= ${Source-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.7.1.orig/debian/hal.preinst +++ hal-0.5.7.1/debian/hal.preinst @@ -0,0 +1,62 @@ +#!/bin/sh + +set -e + +rm_conffile() { + CONFFILE="$1" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $CONFFILE'{s/.* //;p}}\" /var/lib/dpkg/status`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".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/ .*//\"`" + orig_md5sum="`sed -n -e \"/^Conffiles:/,/^[^ ]/{\\\\' $OLD'{s/.* //;p}}\" /var/lib/dpkg/status`" + if [ "$md5sum" != "$orig_md5sum" ]; then + echo "Moving modified conffile $OLD to $NEW..." + mv -f "$OLD" "$NEW" + else + echo "Removing obsolete conffile $OLD ..." + rm -f "$OLD" + fi + fi +} + +case "$1" in +install|upgrade) + if dpkg --compare-versions "$2" le "0.5.4-2ubuntu1"; then + rm_conffile "/etc/hal/fdi/preferences.fdi" + rm_conffile "/etc/dev.d/block/hal-unmount.dev" + rm -f /etc/hotplug.d/default/20-hal.hotplug + 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" lt-nl "0.5.5.1-1ubuntu2"; then + mkdir -p /etc/udev/rules.d + rm -f /etc/udev/rules.d/050_hal-plugdev.rules + mv_conffile /etc/udev/hal.rules /etc/udev/rules.d/85-hal.rules + fi + if dpkg --compare-versions "$2" le "0.5.7-2"; then + rm_conffile "/etc/udev/rules.d/90-hal.rules" + fi +esac + + +if [ -f /etc/dbus-1/event.d/hal ]; then + mv /etc/dbus-1/event.d/hal /etc/dbus-1/event.d/20hal +fi + +#DEBHELPER# --- hal-0.5.7.1.orig/debian/hal.default +++ hal-0.5.7.1/debian/hal.default @@ -0,0 +1,3 @@ +# Additional options for hald +DAEMON_OPTS= + --- hal-0.5.7.1.orig/debian/libhal-storage1.install +++ hal-0.5.7.1/debian/libhal-storage1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libhal-storage.so.* --- hal-0.5.7.1.orig/debian/rules +++ hal-0.5.7.1/debian/rules @@ -0,0 +1,48 @@ +#!/usr/bin/make -f + +DEB_TAR_SRCDIR=hal-0.5.7.1 +DH_VERBOSE=1 + +include /usr/share/cdbs/1/rules/tarball.mk +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/class/autotools.mk +include /usr/share/cdbs/1/class/gnome.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk +include /usr/share/cdbs/1/rules/utils.mk + +DEB_PYTHON_COMPILE_VERSION = 2.4 +DEB_CONFIGURE_EXTRA_FLAGS := --enable-hotplug-map \ + --with-pid-file=/var/run/hal/hald.pid \ + --enable-pcmcia-support \ + --with-hwdata=/usr/share/misc + +post-patches:: + uudecode -o build-tree/$(DEB_TAR_SRCDIR)/tools/device-manager/hal-cpu.png < debian/hal-cpu.png.uuencode + uudecode -o build-tree/$(DEB_TAR_SRCDIR)/tools/device-manager/hal-memory.png < debian/hal-memory.png.uuencode + uudecode -o build-tree/$(DEB_TAR_SRCDIR)/tools/device-manager/hwdb.png < debian/hwdb.png.uuencode + +#common-post-build-arch:: +# cd build-tree/$(DEB_TAR_SRCDIR)/po; intltool-update --verbose -p + +binary-predeb/hal-device-manager:: + dh_pycentral -phal-device-manager + dh_python -phal-device-manager + +common-install-impl:: + # Don't put links in /etc/dev.d and /etc/hotplug.d + rm -rf $(DEB_DESTDIR)/etc/hotplug.d + rm -rf $(DEB_DESTDIR)/etc/dev.d + rm -rf $(DEB_DESTDIR)/usr/lib/hal/hal.hotplug + # Remove hal's default udev rules files.. We ship our own + rm -rf $(DEB_DESTDIR)/etc/udev + + # start/stop hal together with dbus + install -d $(DEB_DESTDIR)/etc/dbus-1/event.d + install -m 755 debian/hal.init.dbus \ + $(DEB_DESTDIR)/etc/dbus-1/event.d/20hal + + # helper scripts and settings for when running with dropped priviledges + install -m 644 -D debian/hal.udev.rules \ + $(DEB_DESTDIR)/etc/udev/rules.d/85-hal.rules + install -m 755 -D debian/hal-unmount.sh \ + $(DEB_DESTDIR)/usr/lib/hal/hal-unmount.sh --- hal-0.5.7.1.orig/debian/watch +++ hal-0.5.7.1/debian/watch @@ -0,0 +1,4 @@ +# format +version=2 + +http://freedesktop.org/~david/dist/ hal-(.*).tar.gz --- hal-0.5.7.1.orig/debian/hwdb.png.uuencode +++ hal-0.5.7.1/debian/hwdb.png.uuencode @@ -0,0 +1,69 @@ +begin 644 ./hal-0.4.7/tools/device-manager/hwdb.png.uuencode +MB5!.1PT*&@H````-24A$4@```"$````C"`8````:+&-D````!F)+1T0````` +M``#Y0[M_````"7!(67,```L3```+$P$`FIP8````!W1)344'U0$(%R`PW,>' +MF```"QE)1$%4>-J-F'N,'?=5QS^_W\S^^^O+NVU_;ZL8Z;&+NV@T/3 +MU!9J_T"D0"@T$2TJ"`%%0!.)\(B0$%(!%2&$"K0"(4(;$&T!!974(4G3+'G8 +ML1MLU][U;M;V>E_>Y]U[=^^=]\SOQQ\[:S:64V6D(XTTOYGS_9WS/=]S?B,> +M_\)/'Y:&_&S&MD5;M^.VQP>\3,,P/IO)V$\5\R5D;%"P"ZA$D<0) +M2BD2$J(@0DI)QLQ0L//DC!S"D"B58)4LM-8(4Q+%(79N]6-*J5\`1C\P"!0B +MITKL:3O`MNY>%A<744JAE&)E>9FYYC1U;Y5L)4,Q6V9'?I"![;N8GY]':TV2 +M)*RNUEAN++`6UFDL-SH\QVL#Y!8_.K5[@TB48JFVA!%9M!7+Q'%,+I=#:TVS +MU6)J:H90^FPK=C&_OH`(3+H[>@C#D$*A@%(*QW&9GIVAHGS^K9]6# +M0_]]8=_>7_O,<_^\""1`_'Y@3"$$A5R>2GL%K35**;36&^'/6)3+;30\A=90 +M*A2I5JH8**I!G?:XAA0"804L%$O\\EOCY&[-&`'`]-0GAH3\$^!)P$\MNB<( +MK36^[Q.$`4F2W$F%4HHXCDD2!0(,TZ"H$QZKG6/'M7_$;JT@]<8SH0PF=GZ* +MCEH=H3=\*""97]@-=`#KJ7-UKVA(M":*(H(@O!,%R[+P?1_7]0B"@*)ML+M- +M4G<\.NHSY)N+&,1(H1!H!(H^;Y')CG8V4`D,(9COJ$X"%:`(V("QL>"N2$@I +M:2L5*.3S1%%$-INEN[L;W_<1`O;M[.;I`Q?)Q./\D7.*5S(/\?.-281.TNUH +ME-#\K#O*G]ZWEUHN']ZOY?J,TJ_^UN3-_TB=9]X/`(",DX2%Q7EF;\\2AN&= +ME"1)@M-CQ9FD$B>68@]_EO7,K^ANOYQI9HB*V\D&$4<'7T"I>O7"*.XPU5S.4H +M9DT^43R')$&(#2[-!@4N7+[*XEJ3NA-0+)4H%`K4&FL\=_8JOS2=9SB[,]1" +M8`B-$(K.]:GC?_RQH>-`/DV->7/'$=*B5(*UW7IT9.TZ35T +MNCS$YMFEDW3T#B*E1$J)81@8AD%?7Q\GCA\G4RCQ5ZT.)^P8\#Z)AFI;%X)Y]?"1K\>C9/T=$/@+)^8./\LVE8_S^SFD,%7!^M9V>+I/N]FUD +M,AFZNKKH[NZFT6@0!@&F+:@U5UBIU?0K8>72(^6N2I#H3*PQ[_YKK?QVH`A7#J-M;9)N[J\2T,AFLK&0M]BC` +M!@>4QDLD4>A@$FV\%;?(%PH4"R4AW-:&$[<((C\YO7]_ +M[L^6ZU^/M38C,)-229X#5=9MO/0 +M+I>\J@-PHMKD&UZ,YWMDBA91'+*X-H]E6$0RQ`D<$D,AA2&>").'F9M]Q$R3 +MGWW@,"F`^%[2;:(U_7OZ6&VY/"6.LK\<\_VE%GTYBR_ON@QJ8^V)['6.'7R0 +M6ZL)H?0I%=K0"62$C2Q(*FT=1"H@:*X5#DY=>4RD/I00K.3L"RD?@BV5(;9T +M4;`M@^YJ'EW($(UVO=LV]Z6)(E02CE*J58*1@':S)<*V+;%KLY. +M2E866VJNS2S14RQQWG,YK5]*FQ3LR33044A6;\P1"A!"8`C8J^'(^0OLO#Z! +MVI1<'!XU+A?QC>_?NW6?;=LWW_3/3T]/G?-^OQW&L`65.C\^\8DIQ>CV? +MK>0S66&;0BXT7..F*!8S9H>]?^@^JS\9`Q3_N72(J>60)VL+%&>F6>WJ1AH& +M[2NKM*\LD<012!-M&L1)0JNMS/-]O60\;S"?SP_:MHUA&*>V;]_^O>'AX6?B +M.&X!D3ER8?RU)(R>^/`#QTZ;9MS9T='Y.TH)QYR9F'.!T2,?$G_=T]-[2FM]IX<((:@YBB^./$B;Y8.*^?-28&4DCB.44F,;<48MJ>6EUK#:=GZ +MYB8(S_/^2SG7?[1_3^OH[?5=>C,281@*`*TU+:WYIP/[:+MOB'8_8+=EH;1B +M.8JX;@AZY1)2J//)S]]>&WDZ3I=YFF8>LXD\%U70$0QS'U*&)))8RT_'0.3;!, +MD[%FAZ\6IK9W7FKQ[;B>J6S5%AW;++9+$JI.Y$A+5$A!$IK1M>J +MM)>+]/;V\;6K;?SM&U'MD2.A+;1SGDO#J]U5+SI'WNH9_=@?RANSII(N<%V(<2= +M<5!K3<.)^.Z$Y)M746/+S7%3-F_LWV'T1K&FKP=C*0`-D&X +MXCV3]T:;S0%MN[?G[X^B9-MG/K7GXTV/D3_XO8>?7E]IBO$K,[E+[YJLM+J8 +M7]%X[CJ.&Z)U0K6L.7$TYQW[<$5_]:MOO6B9TG[YM?F;L=(S:\UX"FBDCC>M +M!7C&/89?!22-]6AEW4D6WCB_LF!E[=4?>:![<'ZVL:8BS]3^XL*)#R652G>) +MXT?S3$ZVZ&SWKGSR5*;D>=YX1WTE\-PB]Y9`2IR6TI+5N)(F^\OP+-VL'!XN="PO.[?E:=/9G'MU^^,!0V7U] +M^-J9O3O45-Y6]E>>NW%FXD9C^+O#<^.3,\XM8"6U3>=-P-L$`*A[G0,V=4*F +MG=C:,A45@/*3O[CCIYJ!N?K,[Y[\B^?^_>87S[XY'6SOS1M_]R_7+P%A"CY( +M=]M*S=_R[#TM7?R0$_LFF,U1W4J!Y('\T+YR]:G/'S[U;]^^-?;2J]-KZ4?# +MU/FF>8";WK_O/"$^P.^#N\%L1F6KF7>!B-+[3=O4A'N>R@4?_+H;C+EEI)7?9#_T_\7]:`K)W@#W2/0````!)14Y$KD)@@@`` +` +end --- hal-0.5.7.1.orig/debian/shlibs.local +++ hal-0.5.7.1/debian/shlibs.local @@ -0,0 +1 @@ +libhal 1 libhal1 (>= 0.5) --- hal-0.5.7.1.orig/debian/changelog +++ hal-0.5.7.1/debian/changelog @@ -0,0 +1,1841 @@ +hal (0.5.7.1-0ubuntu12) edgy; urgency=low + + * Make hal-device-manager depend on hwdb-client-gnome, not hwdb-client. + + -- Adam Conrad Wed, 20 Sep 2006 15:32:55 +1000 + +hal (0.5.7.1-0ubuntu11) edgy; urgency=low + + * Replace debian/patches/19_dont_overwrite_formfactor.patch with official + GIT head upstream patch 00upstream-04-dont-overwrite-formfactor.patch + (http://gitweb.freedesktop.org/?p=hal.git;a=commit;h=f70301c8f426618d52a31d33c846989b1c8e7a52) + Closes: LP#59342) + * debian/patches/17-mp3-player-fdi.patch: + - Add Sandisk Sansa m250. Closes: LP#57903 + - Add SLVR/ROKR iTunes Motorola phone. Closes: LP#55960 + + -- Martin Pitt Mon, 18 Sep 2006 12:16:05 +0200 + +hal (0.5.7.1-0ubuntu10) edgy; urgency=low + + * Add debian/patches/00upstream-01-music-players-fdi.patch: Update + 10-usb-music-players.fdi from GIT head to support many more music players + (this supersedes the current 17-mp3-player-fdi.patch). Closes: LP#59022 + * debian/patches/17-mp3-player-fdi.patch: Add information for the Philips + GoGear SA1330, thanks to Juri Pakaste! Closes: LP#58077 + * debian/10-storage-policy.fdi: Remove enabling of hal-addon-storage, since + 20-storage-methods.fdi already does that. We don't need two h-a-s + processes for each drive. Closes: LP#58935 + * debian/hald.8: Remove --retain-privileges documentation, this option does + not exist any more. Closes: LP#44770 + * Add debian/patches/00upstream-02-mWh-conversion.patch: + - Properly convert mAh to mWh rather than uWh. + - Taken from GIT head: + http://gitweb.freedesktop.org/?p=hal.git;a=commit;h=b30d1320614564d226018b8a491ee4f70567db64 + - Closes: LP#53719 + * Add debian/patches/00upstream-03-fs-on-partitioned-devices.patch: + - Do not probe for a file system on a device which already has partitions + created. This fixes empty bogus mounts for somewhat unclean partition + tables. + - Taken from GIT head: + http://gitweb.freedesktop.org/?p=hal.git;a=commit;h=2c98ffc8dac7ee161042355790256d836e4028f9 + - Closes: LP#19390 + * Add debian/patches/19_dont_overwrite_formfactor.patch: Do not overwrite + the form factor as set by PMU/ACPI/DMI with an 'unknown' value from + computer_probing_pcbios_helper_done(). Thanks to VETSEL Patrice for this + patch! Closes: LP#59342 + + -- Martin Pitt Tue, 12 Sep 2006 10:42:58 +0200 + +hal (0.5.7.1-0ubuntu9) edgy; urgency=low + + * debian/patches/18_fix_dbus_090_build.patch: + + Fix build with dbus (>= 0.90) + + -- Sebastian Dröge Wed, 30 Aug 2006 13:43:52 +0200 + +hal (0.5.7.1-0ubuntu8) edgy; urgency=low + + * Rebuild against dbus 0.90 + + -- Sebastian Dröge Thu, 24 Aug 2006 14:38:43 +0200 + +hal (0.5.7.1-0ubuntu7) edgy; urgency=low + + * debian/control: Fix dependency python2.4-glade2 -> python-glade2. Closes: + LP#57002. + * Add debian/patches/17-mp3-player-fdi.patch: Add MPMan MP-Ki 128 MP3 + Player/Recorder. Closes: LP#44801 + + -- Martin Pitt Wed, 23 Aug 2006 18:50:43 +0200 + +hal (0.5.7.1-0ubuntu6) edgy; urgency=low + + * Add 16-nonpartitions-ending-in-nums.patch: + - Hal currently assumes that device names ending in numbers are + partitions. This patch adds a safe and easy, but slightly ugly + workaround. (Real fix will be discussed with upstream at + https://bugs.freedesktop.org/show_bug.cgi?id=5558) + - This breaks SCSI, USB, and Firewire CD drives, which are usually called + 'scd0', 'sr1', etc. + - Closes: LP#56484 and an impressive number of duplicates. + + -- Martin Pitt Wed, 23 Aug 2006 12:53:21 +0200 + +hal (0.5.7.1-0ubuntu5) edgy; urgency=low + + * debian/rules: Fix hwdata dir: /var/lib/misc -> /usr/share/misc, since + that's where the *.ids files live nowadays. + * debian/hal.postrm: Purge the 'haldaemon' user, not 'hal'. + + -- Martin Pitt Tue, 15 Aug 2006 09:58:34 +0200 + +hal (0.5.7.1-0ubuntu4) edgy; urgency=low + + * debian/hal.install: Revert 0.5.7.1-0ubuntu3 changes, install all + hal-system-storage-* scripts again. + * Add debian/patches/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. + * debian/control: Add pmount dependency to hal for above change. + * debian/control: Replace python version specific p-dbus and p-gnome2 + dependencies with their unversioned package names. Leave p-glade2 for now + since it has not yet been converted. Closes: LP#54615 + + -- Martin Pitt Fri, 4 Aug 2006 10:14:23 +0200 + +hal (0.5.7.1-0ubuntu3) edgy; urgency=low + + * Don't install hal-system-storage-eject, unused + + -- Jonathan Riddell Wed, 2 Aug 2006 14:28:02 +0000 + +hal (0.5.7.1-0ubuntu2) edgy; urgency=low + + * Install scripts/hal-system-storage-*, needed by KDE 3.5.4 + + -- Jonathan Riddell Sun, 30 Jul 2006 21:48:25 +0000 + +hal (0.5.7.1-0ubuntu1) edgy; urgency=low + + * New upstream microrelease: + - Fix compatibility with kernels > 2.6.17 (changed sysfs layout). + - No other changes. + + -- Martin Pitt Thu, 27 Jul 2006 07:32:34 +0200 + +hal (0.5.7-2ubuntu5) edgy; urgency=low + + * debian/control: + + really fix python-dbus depends now + + -- Sebastian Dröge Tue, 11 Jul 2006 22:55:22 +0200 + +hal (0.5.7-2ubuntu4) edgy; urgency=low + + * debian/pycompat: + + and now do it really right and add this file with a 2 in it + + -- Sebastian Dröge Mon, 10 Jul 2006 22:39:28 +0200 + +hal (0.5.7-2ubuntu3) edgy; urgency=low + + * debian/control, + debian/rules: + + update to the new Debian Python Policy + + -- Sebastian Dröge Mon, 10 Jul 2006 17:53:28 +0200 + +hal (0.5.7-2ubuntu2) edgy; urgency=low + + * debian/control: + - fix the python2.4-dbus Depends + + -- Sebastian Dröge Mon, 10 Jul 2006 17:40:12 +0200 + +hal (0.5.7-2ubuntu1) edgy; urgency=low + + * Synchronize to Debian. + + -- Martin Pitt Tue, 27 Jun 2006 15:37:39 +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-1ubuntu18) dapper; urgency=low + + * adding zzz_add_hwdb_button.patch and make the hwdb button in + hal-device-manager reappear + * add hwdb-client to hal-device-manager deps + * fix hdm-python2.4.patch to work cleanly with pittis cdbstpatch script + + -- Oliver Grawert Mon, 22 May 2006 13:19:58 +0200 + +hal (0.5.7-1ubuntu17) dapper; urgency=low + + * Fix my cdbs incompetence + + -- Matthew Garrett Tue, 16 May 2006 17:52:50 +0100 + +hal (0.5.7-1ubuntu16) dapper; urgency=low + + * Omnibook brightness control should have 11 levels (Closes: LP#44962) + + -- Matthew Garrett Tue, 16 May 2006 12:39:44 +0100 + +hal (0.5.7-1ubuntu15) dapper; urgency=low + + * Fix name of 14_prove_volume_invalidlabel.patch -> s/prove/probe/. + * Disable debian/patches/13_probe_input_endianess.patch for now; it is + incorrect (the ioctl expects chars, not long) and causes crashes. + Closes: LP#43962 (and half a dozen dups) + + -- Martin Pitt Wed, 10 May 2006 18:33:34 +0200 + +hal (0.5.7-1ubuntu14) dapper; urgency=low + + * Add debian/patches/14_probe_volume_invalidlabel.patch: + - Do not try to fix device labels with invalid UTF-8 characters if more + than 20% of the characters are invalid. This avoids totally + unintelligible labels while still preserving only mildly damaged ones. + - Closes: LP#27897 + + -- Martin Pitt Wed, 10 May 2006 18:21:02 +0200 + +hal (0.5.7-1ubuntu13) dapper; urgency=low + + * Add debian/patches/13_probe_input_endianess.patch: + - Fix bit testing in probe-input to work on big endian, too. + - Patch taken from upstream CVS. + + -- Martin Pitt Tue, 9 May 2006 09:09:11 +0200 + +hal (0.5.7-1ubuntu12) dapper; urgency=low + + * debian/patches/12_refresh_acpi_states.patch: + backport from CVS, refresh ACPI events after suspend/hibernate. + Half of the fix for [Malone: #33072] + + -- Paul Sladen Mon, 01 May 2006 16:00:05 +0100 + +hal (0.5.7-1ubuntu11) dapper; urgency=low + + * debian/patches/is_mounted_read_only_property.patch: + - backport from CVS for the new "is_mounted_read_only_property" property, + required by gnomevfs,nautilus to fix datas copied from CD being readonly + (http://mail.gnome.org/archives/nautilus-list/2006-March/msg00045.html) + (Ubuntu: #21576) + + -- Sebastien Bacher Fri, 21 Apr 2006 00:00:16 +0200 + +hal (0.5.7-1ubuntu10) dapper; urgency=low + + * Disable debian/patches/01_probe_parttable.patch, it causes regressions + (like CD-ROMs detected as fsusage='partitiontable'). This reopens bug + #19390, but that one is much less evil. + * debian/hal-device-manager.desktop: + - Add X-Ubuntu-Gettext-Domain. + - Update the German translation to match the changed C one from + 0.5.7-1ubuntu7. + * Add debian/hal-device-manager.desktop.in: Reduced h-d-m desktop file with + just _Name and _Comment to add these msgids to the POT. + * Add debian/patches/desktop-POTFILES.patch: Add debian/h-d-m.desktop.in to + POTFILES.in. + * Add debian/patches/11-hdm-nice-keyvalues.patch: + - Beautify the display of list values: do not show a Python unicode prefix + (u'foo') and Python list notation ([...]). + - Closes: LP#35935 + * Rename system user 'hal' to 'haldaemon' to be compatible with upstream + default (and the documentation in the web) and to avoid name conflicts + with user accounts for people whose name is 'Hal'. + - debian/rules: Drop --with-hal-{user,group} + - debian/hal.postinst, debian/hal.init.dbus: Change user name accordingly. + - Closes: LP#11957 + * debian/hal.default: Remove the comments about hal running as user/root, + since this cannot be changed any more. + + -- Martin Pitt Mon, 27 Mar 2006 18:08:12 +0200 + +hal (0.5.7-1ubuntu9) dapper; urgency=low + + * debian/patches/10_volume_and_aliased_keys.patch (addon-keyboard): + - Add macro, volume* and mute keys (special codes <128) + - Add in 'aliased-keys' mirrored onto F19..F23 + - Add battery key at value 236, (waiting for upstream), [Malone: #22451] + + -- Paul Sladen Mon, 27 Mar 2006 16:06:51 +0100 + +hal (0.5.7-1ubuntu8) dapper; urgency=low + + * debian/patches/02_ignored_volumes.patch: + - Only show mounted volumes in /media (not in /mnt any more), and do not + show all VFAT/NTFS mounts. (See discussion in bug #34886) + + -- Martin Pitt Mon, 20 Mar 2006 11:46:44 +0100 + +hal (0.5.7-1ubuntu7) dapper; urgency=low + + * debian/hal-device-manager.desktop: + - use "View hardware information" instead of "HAL Device Manager" + as menu item tooltip + + -- Sebastien Bacher Thu, 16 Mar 2006 14:16:22 +0100 + +hal (0.5.7-1ubuntu6) dapper; urgency=low + + * Add debian/patches/02_ignored_volumes.patch: + - Add a policy for which volumes are shown in gnome-vfs and which aren't. + This replaces the gconf based policy in gnome-vfs2, which was ripped out + two seconds before the final Gnome relase (*cough* freezes?). + - Now ignore volumes on non-hottpluggable and non-removable volumes unless + they are mounted under /mnt or /media, or are a mounted NTFS or VFAT + partition. This should come close to what the majority of users will + want to see. + - Malone #34886 (might also fix at leastparts of #13554) + * Add debian/patches/09_sony_brightness.patch: + - Apply trivial upstream patch to fix LCD brightness setting on Sony + laptops. + - Patch taken from upstream CVS, thanks to Paolo Borelli. + - Malone #31289 + + -- Martin Pitt Wed, 15 Mar 2006 23:07:11 +0100 + +hal (0.5.7-1ubuntu5) dapper; urgency=low + + * debian/10-storage-policy.fdi: Restore most of the settings from hal 0.5.6, + since they are still necessary as long as we don't use gnome-mount: + - Ensures proper mount point for iPods. (Malone #33120) + - Mounts volumes with 'exec' again. (Malone #33621) + + -- Martin Pitt Thu, 9 Mar 2006 12:44:30 +0100 + +hal (0.5.7-1ubuntu4) dapper; urgency=low + + * Add debian/patches/01_probe_parttable.patch: + volume_id/volume_id.c, volume_id_probe_all(): + - Add probing for MS-DOS partition table before probing for file systems. + All calls to this function expect that this function may return a + partition table. + - This also avoids mounting the raw device as a volume when there is + actually a partition on it. (Malone #19390) + * Remove debian/README.Debian, it's obsolete. + + -- Martin Pitt Wed, 8 Mar 2006 11:23:50 +0100 + +hal (0.5.7-1ubuntu3) dapper; urgency=low + + * Add debian/10-storage-policy.fdi and ship it in + /usr/share/hal/fdi/policy/10osvendor/, I did not notice that this was + dropped in Debian. Reinstates 'eject removable devices' policy. + + -- Martin Pitt Fri, 3 Mar 2006 15:44:45 +0100 + +hal (0.5.7-1ubuntu2) dapper; urgency=low + + * debian/patches/05_pmu_nohibernate.patch: Fix crash if + power_management.type does not exist. This happens on e. g. ppc64, which + have SMU, not PMU. Thanks to Alastair Poole for debugging this with me. + + -- Martin Pitt Wed, 1 Mar 2006 11:58:34 +0100 + +hal (0.5.7-1ubuntu1) dapper; urgency=low + + * New upstream version with mainly bug fixes and cleanup, UVF exception + approved by Matt. + * Synchronize to Debian. + * Remove patches which are now upstream: + - 06_dbus-query-capability.patch + - 07_add-keyboard-addons.patch + - 09_privileges-hald.patch + * debian/patches/08_privileges-addons.patch: The bulk of the patch went + upstream. The only change left is the derooting of addon-storage, which is + not appropriate for upstream. + + -- Martin Pitt Mon, 27 Feb 2006 11:07:36 +0100 + +hal (0.5.7-1) experimental; urgency=low + + * New upstream release + * debian/patches/02_hal_addon_pmu.patch + + Removed. Fixed upstream + * debian/patches/03_hald_runnerpath.patch + + Removed. Fixed upstream + + -- Sjoerd Simons Fri, 24 Feb 2006 20:03:09 +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-4ubuntu4) dapper; urgency=low + + * debian/rules: Use gnome.mk to get gettext domain in .desktop file. + + -- Martin Pitt Fri, 24 Feb 2006 07:38:04 +0100 + +hal (0.5.6-4ubuntu3) dapper; urgency=low + + * debian/run-hald.sh: Specify absolute paths in HALD_RUNNER_PATH to make + the runner find the callouts in the source tree. + * debian/patches/08_privileges-addons.patch: Completely rework patch. + - hald/linux2/probing/shared.h: Factor out drop_privileges() into this + header file and add 'keep_auxgroups' parameter. + - hald/linux2/addons/addon-storage.c: Drop privileges with keeping + auxiliary groups right at the start; since the helper repeatedly opens + the device file for good reasons, we cannot keep an opened fd around. + - hald/linux2/addons/addon-acpi.c: + + If /proc ACPI interface is disabled, drop privileges right away (since + everybody can read from acpid). + + Otherwise, drop privileges right after opening the kernel's ACPI + interface. Move this part out of the reconnect loop since after + dropping privs we cannot reconnect (and the kernel interface shouldn't + disappear anyway). + - hald/linux2/addons/addon-pmu.c: Drop all privileges after opening + /dev/adb. + * debian/patches/07_add-keyboard-addons.patch: Remove drop_privileges() + since it's already in shared.h. + * debian/hal.init.dbus: Remove the extra pid check/kill, start-stop-daemon + should be sufficient to stop hal nowadays. + * Revert changes from previous upload; discussion revealed that hal should + deliberately ignore settings in /etc/default/acpi-support, so we don't + need the PMI querying. + + -- Martin Pitt Tue, 21 Feb 2006 16:58:53 +0100 + +hal (0.5.6-4ubuntu2) dapper; urgency=low + + * Add support for using /usr/sbin/pmi to verify capabilities for suspend + versus hibernate. + This will need revisiting later to be implemented more neatly + + -- Daniel Silverstone Mon, 20 Feb 2006 15:56:08 +0000 + +hal (0.5.6-4ubuntu1) dapper; urgency=low + + * Synchronize to Debian to get bug fixes. + - Fix ZIP drive deadlock. (Malone #29822) + * Remove debian/patches/z_autoconf.patch: Not necessary any more, Debian's + 01_hal_privsep.patch already contains autoconf changes. + * Cleaned up names of ubuntu patches. + * Adapt ubuntu specific patches to apply again. + + -- Martin Pitt Tue, 14 Feb 2006 08:39:16 +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-1ubuntu3) dapper; urgency=low + + * Add debian/patches/dbus-query-capability.patch: + - Use hal_device_has_capability() instead of broken "info.capabilities" + parsing. + - Malone #30198, thanks to Scott Robinson for the patch. + + -- Martin Pitt Wed, 8 Feb 2006 13:31:14 +0100 + +hal (0.5.6-1ubuntu2) dapper; urgency=low + + * debian/patches/zz_add-keyboard-addons.patch + - Add a listener for keyboard devices, and fix the ACPI addon to + send the button type on events + + -- Matthew Garrett Mon, 6 Feb 2006 16:35:43 +0000 + +hal (0.5.6-1ubuntu1) dapper; urgency=low + + * Synchronize to Debian. + + -- Martin Pitt Thu, 26 Jan 2006 14:42:02 +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.6-0ubuntu4) dapper; urgency=low + + * debian/hal.install: + - Just install the hal scripts into /usr/share/hal, not into /usr/lib/hal + in addition + - Remove installation of storage scripts again (see 0.5.6-0ubuntu2 + changelog). + + -- Martin Pitt Tue, 24 Jan 2006 09:27:56 +0100 + +hal (0.5.6-0ubuntu3) dapper; urgency=low + + * Update debian/hal.install + - Install hal scripts + + -- Matthew Garrett Tue, 24 Jan 2006 01:16:32 +0000 + +hal (0.5.6-0ubuntu2) dapper; urgency=low + + * Add debian/patches/hald-runner.patch: + - Fork off a small root daemon hald_runner that communicates with hald + over p2p dbus and is responsible to start helpers as root. This allows + the main hald to run with even less privileges and at the same time + enables active elements like power management. + - Patch from Sjoerd Simons, taken from upstream CVS. + * Add debian/patches/privileges-hald.patch: + - Run hald without any auxiliary groups. + * Add debian/patches/privileges-addons.patch: + - storage polling addon: Drop root privileges, run as user hal with + auxiliary groups (since we need them for accessing CD-ROMs etc.). + - acpi polling addon: Drop root privileges, run as user hal without any + additional groups, since everybody can read acpid events. + * debian/hal.install: Install hal-system-{power,lcd}-* scripts to make g-p-m + happy. Do not install the storage scripts for now since they rely on the + integrity of hald (redesigning them is upstream work in progress). + * Remove debian/patches/hal-dbus_max_match_rules_per_connection.patch, it's + obsolete. + * Add debian/run-hald.sh: Script to run hald locally from build-tree. + + -- Martin Pitt Mon, 23 Jan 2006 13:52:44 +0100 + +hal (0.5.6-0ubuntu1) dapper; urgency=low + + * New upstream version. + * Remove debian/patches/cvs-udev-socket.patch: upstream now. + + -- Martin Pitt Tue, 17 Jan 2006 10:15:10 +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-4ubuntu1) dapper; urgency=low + + * Synchronize to Debian, clean up diff cruft. + * Remove superfluous libcap-dev build dependency. + + -- Martin Pitt Mon, 9 Jan 2006 16:57:37 +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-1ubuntu5) dapper; urgency=low + + * Make hal-device-manager depend on python-launchpad-integration + + -- Jonathan Riddell Tue, 3 Jan 2006 02:14:15 +0000 + +hal (0.5.5.1-1ubuntu4) dapper; urgency=low + + * Drop obsolete libsysfs-dev build dependency. + * Bump dbus dependency to >= 0.60 and build against libdbus-1-2. + + -- Martin Pitt Tue, 20 Dec 2005 19:32:40 +0100 + +hal (0.5.5.1-1ubuntu3) dapper; urgency=low + + * debian/hal.udev.rules: Clean up = vs. ==, drop obsolete checks. + + -- Martin Pitt Mon, 5 Dec 2005 15:09:51 +0100 + +hal (0.5.5.1-1ubuntu2) dapper; urgency=low + + * Add debian/patches/cvs-udev-socket.patch: + - Listen to udev events on a socket /org/freedesktop/hal/udev_event. + - This replaces the old hal.hotplug helper binary. + - Patch taken from upstream CVS. + * debian/hal.udev.rules: Send udev events to the socket instead of + hal.hotplug. + * debian/rules: Install udev script as /etc/udev/rules.d/85-hal.rules (not + in /etc/udev any more). + * Remove debian/hal.links to remove the 050_hal-plugdev.rules -> + ../hal.rules symlink. + * debian/hal.preinst: Transition from earlier versions. + - Remove obsolete 050_hal-plugdev.rules symlink. + - Handle hal.rules conffile moving. + + -- Martin Pitt Thu, 1 Dec 2005 15:38:06 +0100 + +hal (0.5.5.1-1ubuntu1) dapper; urgency=low + + * New upstream version that plays with kernels 2.6.13+. + - Fixes rate information for batteries (#18770) + - Should fix crash due to missing hald-addon-usb-csr (#18658). + * Merged Debian changes. + * debian/hal.post{inst,rm}: + - Use force-reload instead of reload since dbus' init script does not + support reload. + - Only start hal manually if it is not yet running (Ubuntu's dbus will + start it automatically). + * debian/hal.{preinst,postrm}: Remove stopping of hald on upgrades since we + do not want to automatically restart hal. + + -- Martin Pitt Thu, 17 Nov 2005 18:33:13 +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-2ubuntu1) dapper; urgency=low + + * Merge to latest Debian package. + * Remove patches that are included upstream now: + - acpi-battery-fixes.patch + - acpi-battery-normalization.patch + - acpid-reconnect.patch + - check_reporting_unit_NULL.patch + - datatypes.patch + - signals-hdm.patch + * Drop debian/patches/drop-privileges-option.patch: This was only relevant + for the Hoary->Breezy upgrade. + * debian/patches/lpi.patch: Adapted to new upstream code. + * debian/hal.preinst: + - Fix parameter passing in rm_conffile(). + - Remove obsolete /etc/hotplug.d/default/20-hal.hotplug on upgrade. + - Remove obsolete /etc/hal/fdi/preferences.fdi on upgrade. (Ubuntu #17561) + * debian/control: + - Lower the udev dependency to >= 0.060 for now. + - Add libhal-dev dependency to libhal-storage-dev. (Ubuntu #17338) + + -- Martin Pitt Wed, 19 Oct 2005 12:44:31 +0200 + +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.3-0ubuntu13) breezy; urgency=low + + * Install hal-find-by-property and hal-find-by-capability since they are + really useful tools. + * Use update-notifier's brand new notify-reboot-required script instead of + creating a hal specific update notification. + + -- Martin Pitt Fri, 30 Sep 2005 19:52:09 +0200 + +hal (0.5.3-0ubuntu12) breezy; urgency=low + + * Add debian/patches/drop-privileges-option.patch: + - Readd option "--drop-privileges" to make Hoary upgrades smoother. + - Ubuntu #15771 + * debian/hal.postinst: Add an update notification that recommends to reboot + the machine soon. + * debian/hal.init.dbus: Remove the notification on hal startup. + + -- Martin Pitt Tue, 20 Sep 2005 11:36:40 +0200 + +hal (0.5.3-0ubuntu11) breezy; urgency=low + + * Add debian/patches/signals-hdm.patch: + - Fix hal-device-manager's signal handling for current dbus. + - Patch stolen from 0.5.4. + - Ubuntu #14088 + * debian/control: + - Move python-launchpad-integration dependency from hal to + hal-device-manager, where it belongs to. + - Ubuntu #14860 + * Add debian/patches/acpid-reconnect.patch: + - Reconnect to acpid if it was restarted. + - Thanks to Ryan Lortie for this patch. + - Ubuntu #14852 + * Add debian/patches/acpi-battery-normalization.patch: + - Ported Ryan Lortie's patch for better calculating battery charge levels. + - Hopefully fixes Ubuntu #14246. + + -- Martin Pitt Thu, 8 Sep 2005 19:40:48 +0200 + +hal (0.5.3-0ubuntu10) breezy; urgency=low + + * 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/hald.8: --drop-privileges does not exist any more, document + --retain-privileges. + + -- Martin Pitt Wed, 24 Aug 2005 11:49:53 +0200 + +hal (0.5.3-0ubuntu9) breezy; urgency=low + + * debian/patches/storage-policy-debian.patch: + - Fix eject property. It is storage.requires_eject, not + storage.policy.requires_eject. Meh. + + -- Martin Pitt Tue, 23 Aug 2005 16:14:52 +0200 + +hal (0.5.3-0ubuntu8) breezy; urgency=low + + * debian/patches/storage-policy-debian.patch: + - Enable storage.policy.requires_eject on USB storage devices to always + eject them (which causes them to properly power off). This replaces the + gnome-vfs2 patch which does not work properly any more. + * debian/patches/acpi-battery-fixes.patch: + - Fix bogus values if BIOS reports battery.voltage.design but not + battery.voltage.current. + - Ubuntu #13990 + + -- Martin Pitt Tue, 23 Aug 2005 14:55:26 +0200 + +hal (0.5.3-0ubuntu7) breezy; urgency=low + + * debian/patches/lpi.patch: + - add support for LaunchpadIntegration into hal-device-manager + + -- Michael Vogt Mon, 22 Aug 2005 19:20:27 +0200 + +hal (0.5.3-0ubuntu6) breezy; urgency=low + + * debian/patches/check_reporting_unit_NULL.patch: + - hal-0.5.3/hald/linux2/acpi.c, battery_refresh(): Check for NULL + reporting_unit to avoid segfault. + + -- Martin Pitt Mon, 22 Aug 2005 13:56:19 +0200 + +hal (0.5.3-0ubuntu5) breezy; urgency=low + + * Do not restart hal on upgrades. (Ubuntu #13312) + * debian/hal.postrm: Add --system option to deluser for safety. + * debian/hal.prerm: If hald doesn't stop properly, try harder with kill -9. + + -- Martin Pitt Wed, 17 Aug 2005 13:24:57 +0200 + +hal (0.5.3-0ubuntu4) breezy; urgency=low + + * Add debian/patches/acpi-battery-fixes.patch: + - Ported various ACPI battery fixes from development version + hal@arch.ubuntu.com/hal--MAIN--0 (thanks to the arch supermirror): + patch-612, patch-622, patch-623, patch-625, patch-629, patch-631, + patch-640, patch-641, patch-642, patch-644, patch-645 + - Ubuntu #13446 + + -- Martin Pitt Tue, 16 Aug 2005 20:43:52 +0200 + +hal (0.5.3-0ubuntu3) breezy; urgency=low + + * Add debian/patches/datatypes.patch: + - Fix FTBFS on amd64 due to conflicting definitions of [u]int64_t in + config.h and sys/types.h. + - Disable datatypes check in configure.in, regenerate configure. + - Replace all kernel-style datatypes (like __u16) with their official + userspace counterparts (like int16_t) since config.h doesn't export the + kernel-style ones any more. + - This is a quick and ugly hack (tm). + + -- Martin Pitt Thu, 11 Aug 2005 22:51:50 +0200 + +hal (0.5.3-0ubuntu2) breezy; urgency=low + + * debian/control: + - build with the current dbus package. + + -- Sebastien Bacher Thu, 11 Aug 2005 11:16:46 +0200 + +hal (0.5.3-0ubuntu1) breezy; urgency=low + + * New upstram bugfix release. + - Handles degrading battery capacity. (Ubuntu #12909) + * Removed debian/patches/property-null-values.patch, adopted upstream. + * debian/patches/storage-policy-debian.patch: Dropped noatime/sync handling + hunk since upstream now does the right thing. + * debian/hal.postinst: Fix dbus init script name to restart dbus and hal + correctly after package upgrade. + + -- Martin Pitt Fri, 29 Jul 2005 09:49:13 +0200 + +hal (0.5.2-0ubuntu5) breezy; urgency=low + + * Added debian/patches/property-null-values.patch: + - hald/hal_property_new_string(): If the given value is NULL, create a + property with value "" instead of NULL to prevent all sorts of segfaults + at a very low level. (Ubuntu #11060) + + -- Martin Pitt Tue, 24 May 2005 10:00:57 +0200 + +hal (0.5.2-0ubuntu4) breezy; urgency=low + + * debian/patches/storage-policy-debian.patch: Restore the policy to mount + devices smaller than 2GB (i. e. usually USB flash sticks) with "noatime" + to cut down wearout. + + -- Martin Pitt Fri, 20 May 2005 08:36:34 +0200 + +hal (0.5.2-0ubuntu3) breezy; urgency=low + + * debian/patches/storage-policy-debian.patch: + - Remove the sync/async mounting policy so that all devices are mounted + "async" by default. + - This will avoid physical damage of flash chips due to exaggerated + updating of inode/FAT structures and greatly speed up the write + throughput. On the bad side this makes it much less safe to remove devices + without proper umounting. + - Debian #309625. + * debian/preferences.fdi: Adopt the comment for the sync/async example. + + -- Martin Pitt Wed, 18 May 2005 18:03:12 +0200 + +hal (0.5.2-0ubuntu2) breezy; urgency=low + + * Uploaded out of date diff.gz previously; reupload to fix FTBFS. + + -- Martin Pitt Tue, 17 May 2005 13:30:23 +0200 + +hal (0.5.2-0ubuntu1) breezy; urgency=low + + * New upstream release. + * Dropped debian/patches/hal-dbus_max_match_rules_per_connection.patch, this + was accepted upstream. + + -- Martin Pitt Fri, 13 May 2005 12:22:45 +0200 + +hal (0.5.1-0ubuntu1) breezy; urgency=low + + * New upstream release. + * Dropped patches (included upstream): + - debian/patches/device-manager-gtk-true.patch + - debian/patches/fix-droppriv.patch + * debian/control: Tightened dbus dependencies to >= 0.33. + * debian/control: Added hal dependency to dbus. + + -- Martin Pitt Tue, 10 May 2005 17:20:18 +0200 + +hal (0.5-0ubuntu1) breezy; urgency=low + + * New upstream version with a radically new architecture, and ABI break. + Introduces new package names (due to SONAME changes). + * Updated patches to new upstream version: + - hal-dbus_max_match_rules_per_connection.patch + - readme-remove-hacking.patch + - storage-policy-debian.patch + * Dropped patches: + - hal-fdi.patch (included upstream) + - hal-hotplug-map.patch (this program does not exist any more) + - ids-search.patch (included upstream) + - no_sysdevice.patch (obsolete) + - ubuntu-03-cdrom-debugging.patch (obsolete) + * Temporarily dropped patches which need to be redesigned: + - ubuntu-01-lsbrelease.patch + - ubuntu-02-procfs.patch + - ubuntu-04-hwdb.patch + - ubuntu-05-dmidecode.patch + - ubuntu-06-harddisk-volumes.patch (depends on behavior of new gnome-vfs) + - ubuntu-99-autoconf.patch (not necessary any more for now) + * Renamed debian/docs to debian/hal.docs for consistency. + * debian/hal.default: hal now defaults to run as normal user, so invert the + setting and documentation. + * Added debian/patches/fix-droppriv.patch: + - hald/hald.c: Drop privileges after calling osspec_init(), since the + latter opens a netlink socket, which requires root privileges. + * debian/hal.install: Install preferences.fdi into etc/hal/fdi/policy to + match new layout. + * Added debian/patches/device-manager-gtk-true.patch: + - Replace deprecated "gtk.TRUE" with "True" to avoid warning. + + -- Martin Pitt Wed, 13 Apr 2005 13:22:36 +0200 + +hal (0.4.7-1ubuntu14) hoary; urgency=low + + * hal-device-manager.desktop: Added translations. (Ubuntu #7370) + + -- Martin Pitt Tue, 29 Mar 2005 15:07:24 +0200 + +hal (0.4.7-1ubuntu13) hoary; urgency=low + + * Added debian/patches/ubuntu-06-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). + - Ubuntu #7641 + + -- Martin Pitt Thu, 17 Mar 2005 12:58:55 +0100 + +hal (0.4.7-1ubuntu12) hoary; urgency=low + + * debian/hal.preinst: Fix test for /etc/dbus-1/event.d/hal -> 20hal upgrade + to avoid asking dpkg questions on upgrade. (Ubuntu #7418) + * debian/hal.postinst: Do not fail if addgroup plugdev fails (which happens + sometimes if the group is already present). + + -- Martin Pitt Thu, 10 Mar 2005 15:56:28 +0100 + +hal (0.4.7-1ubuntu11) hoary; urgency=low + + * patch hal/hal.conf.in instead of hal/hal.conf + + -- Michael Vogt Tue, 8 Mar 2005 10:38:02 +0100 + +hal (0.4.7-1ubuntu10) hoary; urgency=low + + * set 512 in + /etc/dbus-1/system.d/hal.conf (default is 128) + This fixes the problem that hal-device-manager can not start for + systems with a lot of devices (closes: #7188) + + -- Michael Vogt Mon, 7 Mar 2005 13:27:01 +0100 + +hal (0.4.7-1ubuntu9) hoary; urgency=low + + * Added debian/patches/ubuntu-05-dmidecode.patch: + - Read the output of dmidecode (though a setuid wrapper) and create + appropriate hal nodes. + - Patch from Oliver Grawert . + * debian/hal.install: Install new hal-dmiwrapper to /usr/lib/hal. + * debian/hal.postinst: Set permissions of /usr/lib/hal/hal-dmiwrapper to + root:hal 4751. + * debian/patches/ubuntu-99-autoconf.patch: Regenerated. + + -- Martin Pitt Wed, 2 Mar 2005 11:43:56 +0100 + +hal (0.4.7-1ubuntu8) hoary; urgency=low + + * debian/hal.postinst: Ensure that the 'hal' user is always in groups + 'cdrom' and 'floppy', since this breaked sometimes when upgrading from + earlier versions. (Ubuntu #6497) + * Added debian/patches/no_sysdevice.path: Don't die when a device doesn't + have a sysfs path when finalizing the class device. (Debian #293630) Patch + stolen from Debian version 0.4.7-2, thanks to Sjoerd Simons. + + -- Martin Pitt Mon, 28 Feb 2005 15:59:04 +0100 + +hal (0.4.7-1ubuntu7) hoary; urgency=low + + * debian/rules: Call uudecode in post-patches:: instead of configure/hal:: + to fix FTBFS in some cases. + + -- Martin Pitt Fri, 25 Feb 2005 13:07:34 +0100 + +hal (0.4.7-1ubuntu6) hoary; urgency=low + + * Added debian/patches/ubuntu-03-cdrom-debugging.patch: + - Report errors in hald/linux/block_class_device.c:cdrom_get_properties(). + * Integrate hwdb-gui calling into hal-device-manager. Patch from Oliver + Grawert : + - Added debian/patches/ubuntu-04-hwdb.patch (h-d-m changes) + - deian/control: Suggest hwdb-client. + * Added debian/*.png.uuencode (Icons for lsbrelease and procfs patches and + hwdb integration), install them in debian/rules. From Oliver + Grawert . + * Build-Depend on sharutils. + * Updated debian/patches/ubuntu-99-autoconf.patch, this time with a better + matching automake version to produce a smaller patch. + + -- Martin Pitt Fri, 25 Feb 2005 10:44:48 +0100 + +hal (0.4.7-1ubuntu5) hoary; urgency=low + + * debian/rules: Disable fstab-sync building. + + -- Martin Pitt Thu, 24 Feb 2005 09:48:59 +0100 + +hal (0.4.7-1ubuntu4) hoary; urgency=low + + * Added debian/patches/ubuntu-01-lsbrelease.patch: + - Support reading the output of lsb_release and add the properties to the + root device. + - Thanks to Oliver Grawert for the patch. + * Added debian/patches/ubuntu-02-procfs.patch: + - Support reading /proc/{cpuinfo,meminfo} and create two new devices + "Processor" and "Memory". + - Thanks to Oliver Grawert for the patch. + * Added debian/patches/ubuntu-99-autoconf.patch: + - Oliver's patches touch Makefile.am; This patch contains the + Makefile/configure changes. + * debian/rules: Configure with --with-hwdata=/var/lib/misc to allow hal to + find pci.ids and usb.ids. + + -- Martin Pitt Mon, 14 Feb 2005 12:27:59 +0100 + +hal (0.4.7-1ubuntu3) hoary; urgency=low + + * Put user hal into group 'plugdev' also for upgrades, not just on new + installations. + + -- Martin Pitt Mon, 7 Feb 2005 10:36:13 +0100 + +hal (0.4.7-1ubuntu2) hoary; urgency=low + + * Removed hotplug device group management (this now gets handled by udev + proper): + - Removed debian/hal.udev.{device-removable.sh,rules}, debian/hal.links + - debian/rules: Don't install these files. + * debian/hal.preinst: Remove obsolete /etc/udev/hal.rules and + /etc/udev/scripts/device-removable.sh if it was not modified. + * debian/hal.postinst: Do not update udev with broken do_udev method, this + is not necessary any more. (Ubuntu #6235) + * debian/postinst: Add hal user to the "plugdev" group since udev now puts + removable devices into this group. + * debian/preinst: In hal->20hal transition, check that 20hal does not yet + exist. + + -- Martin Pitt Mon, 7 Feb 2005 09:32:31 +0100 + +hal (0.4.7-1ubuntu1) hoary; urgency=low + + * Merged Debian version (new upstream bugfix release). + + -- Martin Pitt Thu, 27 Jan 2005 10:31:56 +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.4-0ubuntu1) hoary; urgency=low + + * New upstream bugfix release, fixes a regression of 0.4.3 and a buffer + overflow + * debian/patches/netdev-recovery.patch: removed, adopted upstream + + -- Martin Pitt Fri, 7 Jan 2005 12:54:54 +0100 + +hal (0.4.3-1ubuntu1) hoary; urgency=low + + * Merged new Debian version + - does not ship the sony_dsc fdi any more, which avoids showing the photo + import dialog twice (Ubuntu bug #4767) + + -- Martin Pitt Tue, 4 Jan 2005 23:23: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-4ubuntu1) hoary; urgency=low + + * Merge to new Debian release + * hal.preinst, hal->20hal conffile transition: added md5sum of older version + to avoid dpkg conffile question + + -- Martin Pitt Thu, 23 Dec 2004 20:28:03 +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-3ubuntu1) hoary; urgency=low + + * Merged changes from new Debian release + - fixes handling of spaces in mount points (Ubuntu bug #4223) + * removed ubuntu-hal-unmount-sanitycheck.patch (adopted in Debian) + * Since the python 2.4 changes require direct patching of the debian control + files anyway: statically applied Ubuntu specific patches and removed them: + - ubuntu-conffile-transition.patch + - ubuntu-lsbinit.patch + - ubuntu-menu.patch + * debian/hal.preinst: + - fixed md5sum checking of /etc/dev.d/default/unmount.dev to make it + actually work + + -- Martin Pitt Mon, 20 Dec 2004 10:04:06 +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-2ubuntu3) hoary; urgency=low + + * Build using python2.4. + + -- Matthias Klose Fri, 17 Dec 2004 17:00:42 +0100 + +hal (0.4.2-2ubuntu2) hoary; urgency=low + + * Rescued the accidentially dropped changes from 0.4.2-1ubuntu[34]: + - ubuntu-dbus-conffile-transition.patch: reworked, version from -1ubuntu4 + was totally broken (it patched itself) + - ubuntu-hal-unmount-sanitycheck.patch: added; check in hal-unmount.dev + that the device to be removed starts with '/' + * renamed patch ubuntu-dbus-conffile-transition.patch to + ubuntu-conffile-transition.patch since it now contains other transitions + * ubuntu-conffile-transition.patch: + - apparently some older hal versions installed + /etc/udev/scripts/device-removable.sh as non-executable; make it + executable if we upgrade from a version before 0.4.2-2ubuntu2 + + -- Martin Pitt Wed, 15 Dec 2004 14:21:03 +0100 + +hal (0.4.2-2ubuntu1) hoary; urgency=low + + * Merged to new Debian release. + * Removed patches (adopted in Debian): + - ubuntu-cdrom-media-check.patch + - ubuntu-fix-ide-fdi.patch + - ubuntu-ids-search.patch + - ubuntu-poll-only-cdroms.patch + - z_autoreconf.patch + + -- Martin Pitt Tue, 14 Dec 2004 12:22:10 +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-1ubuntu4) hoary; urgency=low + + * 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="". + + -- Scott James Remnant Fri, 10 Dec 2004 15:13:05 +0100 + +hal (0.4.2-1ubuntu3) hoary; urgency=low + + * ubuntu-dbus-conffile-transition.patch: + - Remove /etc/dev.d/default/unmount.dev if it has not been modified, + this was deprecated a long time ago and doesn't do anything other + than cause every filesystem to get unmounted. + + -- Scott James Remnant Fri, 10 Dec 2004 14:58:46 +0100 + +hal (0.4.2-1ubuntu2) hoary; urgency=low + + * debian/patches/ubuntu-fix-ide-fdi.patch: + - Fix missing slash in closing tag in ide-drives.fdi. + * ubuntu-poll-only-cdroms.patch: + - Throw out the broken check for PCMCIA ide devices (which was intended to + disable media checking on them) and instead poll only on CD-ROM drives. + - Taken from upstream CVS. + - Ubuntu bug #2265 + * debian/patches/ubuntu-cdrom-media-check.patch: + - Fix media checking capability test. + - 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 + - Ubuntu bug #4005 + * debian/patches/ubuntu-ids-search.patch: + - Disable check for pci.ids path in configure.in and instead check for the + path at runtime; this fixes the current FTBFS and broken runtime + behavior with the most recent pciutils. + - Thanks to Sjoerd Simons for preparing the patch. + * debian/patches/z-autoreconf.patch: + - updated configure to make ubuntu-ids-search.patch active + + -- Martin Pitt Mon, 6 Dec 2004 14:59:22 +0100 + +hal (0.4.2-1ubuntu1) hoary; urgency=low + + * Merged to new Debian version. + + -- Martin Pitt Thu, 2 Dec 2004 15:20:57 +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-2ubuntu1) hoary; urgency=low + + * Debian adopted the "do not run as root" approach and most of our Ubuntu + changes; thanks to Sjoerd for his great cooperation + * Dropped patches (adopted by Debian): + - ubuntu-dbus-dependency.patch + - ubuntu-plugdev.patch + - ubuntu-runasuser.patch + - ubuntu-unmount_dev.d.patch + - ubuntu-readme.patch + - ubuntu-storage-policy.patch + * Dropped obsolete ubuntu-oldpkgtransition.patch; this was relevant only for + pre-Warty release + * debian/patches/ubuntu-lsbinit.patch: rewrote for new init script + * ubuntu-dbus-conffile-transition.patch: + - added + - handle /etc/dbus-1/event.d/hal -> 20hal transition without a dpkg + question if the original conffile is unmodified + + -- Martin Pitt Mon, 29 Nov 2004 11:30:36 +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-1ubuntu6) hoary; urgency=low + + * debian/patches/ubuntu-unmount_dev.d.patch: + + added + + install /etc/dev.d/default/unmount.dev which automatically unmounts + removed devices which are still mounted; this is more robust than the + previous pmount method, which required a policy hole in pmount + (since hal runs as normal user) and did not unmount all partitions of a + drive from time to time + * debian/patches/ubuntu-pmount.patch: + + removed, it is not needed any more (obsoleted by above patch) + + -- Martin Pitt Tue, 16 Nov 2004 18:43:10 +0100 + +hal (0.4.1-1ubuntu5) hoary; urgency=low + + * debian/patches/ubuntu-storage-policy.patch: install + /etc/hal/fdi/ubuntu-storage-policy.fdi; this defaults to using + 'sync,noatime' mount options for hotpluggable drives < 1 GB and + 'async,atime' for bigger drives. As a conffile, it makes further + customizations easy. However, to actually use this, you need a HAL-aware + pmount (version 0.4+) and a gnome-volume-manager that uses pmount-hal + (1.0.2-4ubuntu4+). (Ubuntu bug #2386) + + -- Martin Pitt Mon, 15 Nov 2004 17:03:02 +0100 + +hal (0.4.1-1ubuntu4) hoary; urgency=low + + * debian/patches/ubuntu-plugdev.patch: debhelper does not seem to like + relative link targets; use absolute target in hal.links to make the udev + rules symlink actually work + + -- Martin Pitt Mon, 15 Nov 2004 14:21:54 +0100 + +hal (0.4.1-1ubuntu3) hoary; urgency=low + + * debian/patches/ubuntu-plugdev.patch: + + install device-removable.sh in /etc/udev/scripts/ now (as suggested by + Marco d'Itri); the old location /usr/share/hal/ might not be available + early enough + + install rules file in /etc/udev/ now and symlink it from + /etc/udev/rules.d/ to allow better configurability + + -- Martin Pitt Fri, 12 Nov 2004 16:32:10 +0100 + +hal (0.4.1-1ubuntu2) hoary; urgency=low + + * debian/patches/ubuntu-plugdev.patch: now change the group of removable + device nodes to 'plugdev' by introducing custom udev rules (formerly the + udev package did this on itself, but this functionality is now moved to + hal, where it actually belongs; consensus with Marco d'Itri). + + Added versioned dependency to udev >= 0.042 (which does not have the + plugdev rules any more) + + Added debian/device-removable.sh (installed in /usr/share/hal/) which + decides whether a device is removable by looking at its 'removable' + sysfs attribute (supported by kernels 2.6.8+). + + Added debian/z_hal-plugdev.rules (installed in /etc/udev/rules.d/) to + put IDE and SCSI drives in 'plugdev' if device-removable.sh returns true. + + -- Martin Pitt Thu, 11 Nov 2004 13:54:11 +0100 + +hal (0.4.1-1ubuntu1) hoary; urgency=low + + * Synchronized to new Debian version. + * debian/patches/ubuntu-lsbinit.patch: + + adapted to work with new release + + -- Martin Pitt Mon, 8 Nov 2004 21:20:16 +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-1ubuntu2) hoary; urgency=low + + * Build-depend on libxml-parser-perl to fix FTBFS. + + -- Martin Pitt Wed, 27 Oct 2004 12:13:53 +0200 + +hal (0.4.0-1ubuntu1) hoary; urgency=low + + * Resynchronized to the Debian package; thanks to Sjoerd for making this + (and future syncs) easy. + * Now maintain all Ubuntu-specific changes as patches prefixed with + "ubuntu-" + * Patches taken over from previous Ubuntu releases: + + ubuntu-dbus-dependency: change python2.3-dbus dependency from -1.1 + (Debian) to -1ubuntu1 (Ubuntu) + + ubuntu-lsbinit: pretty initscript + + ubuntu-menu: Ubuntu-compliant desktop file + + ubuntu-oldpkgtransition: clean upgrades from versions <= + 0.2.92-1ubuntu13 + + ubuntu-plugdev: install and run in group plugdev + + ubuntu-pmount: use pmount for forced unmounting + + ubuntu-readme: describe Ubuntu changes in README.Debian + + ubuntu-runasuser: default to run as user, not root + + -- Martin Pitt Thu, 21 Oct 2004 13:13:58 +0200 + +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.7.1.orig/debian/hal.postinst +++ hal-0.5.7.1/debian/hal.postinst @@ -0,0 +1,74 @@ +#! /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) + if ! getent passwd haldaemon >/dev/null; then + rmdir /var/run/hald 2>/dev/null || true + adduser --disabled-password --quiet --system --home /var/run/hal \ + --gecos "Hardware abstraction layer" --group haldaemon + fi + adduser --quiet haldaemon floppy + adduser --quiet haldaemon cdrom + addgroup --quiet --system plugdev 2>/dev/null || true + adduser --quiet haldaemon plugdev + + # be sure the run dir is owned by the hal user + chown haldaemon:haldaemon /var/run/hal 2>/dev/null || true + + if [ -f /etc/init.d/hal ]; then + # handle upgrades + mv /etc/init.d/hal /etc/dbus-1/event.d/ + update-rc.d hal remove + fi + + # only start hal if it is not already running + if [ ! -e /var/run/hal/hald.pid ] || ! ps --no-headers -p $(cat /var/run/hal/hald.pid) > /dev/null ; then + if [ -x /etc/init.d/dbus ]; then + invoke-rc.d dbus force-reload || true + if [ ! -e /var/run/hal/hald.pid ] || ! ps --no-headers -p $(< /var/run/hal/hald.pid) > /dev/null ; then + /etc/dbus-1/event.d/20hal start || true + fi + fi + else + # trigger update notification which recommends to reboot + [ -x /usr/share/update-notifier/notify-reboot-required ] && \ + /usr/share/update-notifier/notify-reboot-required || true + 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.7.1.orig/debian/hal.manpages +++ hal-0.5.7.1/debian/hal.manpages @@ -0,0 +1,2 @@ +debian/hald.8 +debian/lshal.1 --- hal-0.5.7.1.orig/debian/hal.dirs +++ hal-0.5.7.1/debian/hal.dirs @@ -0,0 +1,2 @@ +/var/run/hal +/etc/hal/fdi --- hal-0.5.7.1.orig/debian/hal.docs +++ hal-0.5.7.1/debian/hal.docs @@ -0,0 +1 @@ +build-tree/*/doc/TODO --- hal-0.5.7.1.orig/debian/lshal.1 +++ hal-0.5.7.1/debian/lshal.1 @@ -0,0 +1,54 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH LSHAL 1 "Oktober 24, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) + +.SH NAME +lshal \- List devices and their properties + +.SH SYNOPSIS +.BR lshal " [" \-\-monitor ] + +.SH DESCRIPTION +Shows a list of all devices with their properties. + +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. + +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (\`\-\'). +A summary of options is included below. +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.B \-\-monitor +If this option is given then the device list and all devices are monitored for +changes. + + +.SH SEE ALSO +.BR hal\-device\-manager (1), +.BR hal\-get\-property (1), +.BR hal\-set\-property (1). +.br +For more information visit http://freedesktop.org/Software/hal + +.SH AUTHOR +This manual page was written by Martin Waitz , +for the Debian project (but may be used by others). --- hal-0.5.7.1.orig/debian/libhal-dev.install +++ hal-0.5.7.1/debian/libhal-dev.install @@ -0,0 +1,5 @@ +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.la +debian/tmp/usr/lib/libhal.a --- hal-0.5.7.1.orig/debian/hal.postrm +++ hal-0.5.7.1/debian/hal.postrm @@ -0,0 +1,19 @@ +#!/bin/sh + +set -e + +# Do not restart dbus on upgrades, only if we remove the package. +if [ "$1" = "remove" ] ; then + if [ -x /etc/init.d/dbus ]; then + invoke-rc.d dbus force-reload || true + fi +fi + +#DEBHELPER# + +if [ "$1" = "purge" ] ; then + deluser --quiet --system haldaemon > /dev/null || true + delgroup --quiet --system haldaemon > /dev/null || true +fi + +exit 0 --- hal-0.5.7.1.orig/debian/compat +++ hal-0.5.7.1/debian/compat @@ -0,0 +1 @@ +5 --- hal-0.5.7.1.orig/debian/libhal1.install +++ hal-0.5.7.1/debian/libhal1.install @@ -0,0 +1 @@ +debian/tmp/usr/lib/libhal.so.* --- hal-0.5.7.1.orig/debian/hal-device-manager.desktop.in +++ hal-0.5.7.1/debian/hal-device-manager.desktop.in @@ -0,0 +1,4 @@ +[Desktop Entry] +Encoding=UTF-8 +_Name=Device Manager +_Comment=View hardware information --- hal-0.5.7.1.orig/debian/run-hald.sh +++ hal-0.5.7.1/debian/run-hald.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +cd build-tree/hal-*/hald +P="`pwd`" +export HALD_RUNNER_PATH=$P/linux2:$P/linux2/probing:$P/linux2/addons:.:$P/../tools:$P/../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.7.1.orig/debian/hal-device-manager.install +++ hal-0.5.7.1/debian/hal-device-manager.install @@ -0,0 +1,3 @@ +debian/tmp/usr/bin/hal-device-manager +debian/tmp/usr/share/hal/device-manager/ +debian/hal-device-manager.desktop usr/share/control-center-2.0/capplets/ --- hal-0.5.7.1.orig/debian/hal-memory.png.uuencode +++ hal-0.5.7.1/debian/hal-memory.png.uuencode @@ -0,0 +1,17 @@ +begin 644 hal-0.4.7/tools/device-manager/hal-memory.png.uuencode +MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`_P#_ +M`/^@O:>3````"7!(67,```L2```+$@'2W7[\````!W1)344'U0$>%@`NQ_S\ +M+0```=Y)1$%4.,O5T\UJ$U$`Q?%_82>!_@M#N?`I4\* +MX,7KS6VW5-WZW?R#;>000J*R%HW3!J[C(H3$REHT_S8IYQW458.W6]L*B"1` +MOEQ[8+/?VV,4A/2-`&`#V)$`0@IT +MHGGT\#')9$*[U2(,HPO,\NIT. +MTC!HGIT!X'D>KNLRCB(F2<)4ZWD@+02]09=7;UY2+!:H5JJ,QQ&?O^Q2J]6H +MN"Z[^Y\X//R&GGG9R341;2@49P1)\`55!DJY)^ +MV.6FNS0/!,V`!W=6J.36L*\48*9!I-`L(5)@*0L]T0S[59RJR\]__7D@4\CI +MYQOW,3,F4S2D8<84I13*5H2#$5-`QPF&:?)^YR.`OAC2C7O+[M/;*^_B.'%2 +MZ31::XR,A!DH6Q$-0TQE$8<1`!_VCCN_ZMXF,+W\7^(_,]?#"UM`0[<````` +(245.1*Y"8((` +` +end --- hal-0.5.7.1.orig/debian/hald.8 +++ hal-0.5.7.1/debian/hald.8 @@ -0,0 +1,61 @@ +.\" Hey, EMACS: -*- nroff -*- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH HALD 8 "Oktober 24, 2003" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage-specific macros, see man(7) + +.SH NAME +hald \- daemon for Hardware Abstraction Layer + +.SH SYNOPSIS +.B hald +[\-\-daemon=yes|no] [\-\-verbose=yes|no] [\-\-help] + +.SH DESCRIPTION +The HAL daemon detects devices present in the system and provides the +org.freedesktop.Hal service through D\-BUS. + +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. + +.SH OPTIONS +These programs follow the usual GNU command line syntax, with long +options starting with two dashes (`\-'). +A summary of options is included below. +.TP +.B \-h, \-\-help +Show summary of options. +.TP +.BR \-\-daemon=yes|no +By default, \fBhald\fP detaches from the current tty and +starts running in the background, thus becoming a daemon. +You can suppress this behaviour by using \fBno\fP here. +.TP +.BR \-\-verbose=yes|no +\fBhald\fP prints out debug information when this is set to yes. + +.SH SEE ALSO +.BR lshal (1), +.BR hal\-device\-manager (1), +.BR hal\-get\-property (1), +.BR hal\-set\-property (1). +.br +For more information visit http://freedesktop.org/Software/hal + +.SH AUTHOR +This manual page was originally written by Martin Waitz and +updated by Sjoerd Simons , for the Debian project (but may +be used by others). --- hal-0.5.7.1.orig/debian/libhal1.shlibs +++ hal-0.5.7.1/debian/libhal1.shlibs @@ -0,0 +1 @@ +libhal 1 libhal1 (>= 0.5) --- hal-0.5.7.1.orig/debian/hal-doc.install +++ hal-0.5.7.1/debian/hal-doc.install @@ -0,0 +1 @@ +debian/tmp/usr/share/doc/hal-*/* usr/share/doc/hal-doc --- hal-0.5.7.1.orig/debian/hal-unmount.sh +++ hal-0.5.7.1/debian/hal-unmount.sh @@ -0,0 +1,16 @@ +#!/bin/sh + +# sanity check. DEVNAME should start with a / +[ "$DEVNAME" != "${DEVNAME#/}" ] || exit 0 + +# Lazily unmount drives which are removed, but still mounted +if [ "$ACTION" = remove ] \ + && (grep -q "^$DEVNAME" /proc/mounts || grep -q "^$DEVNAME" /etc/mtab); then + if [ -x /usr/bin/pumount ] ; then + /usr/bin/pumount -l "$DEVNAME"; + else + /bin/umount -l "$DEVNAME"; + fi +fi + +exit 0 --- hal-0.5.7.1.orig/debian/hal-device-manager.desktop +++ hal-0.5.7.1/debian/hal-device-manager.desktop @@ -0,0 +1,33 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Device Manager +Name[ca]=Gestor de dispositius +Name[da]=Enhedshåndtering +Name[de]=Gerätemanager +Name[fa]=مدیر سخت افزار +Name[fi]=Laitehallinta +Name[fr]=Gestionnaire de périphériques +Name[hu]=Eszközkezelő +Name[it]=Gestore Periferiche +Name[nl]=Apparaatbeheer +Name[pt]=Gestor de dispositivos +Name[pt_BR]=Gerenciador de Dispositivos +Comment=View hardware information +Comment[ca]=Gestor de dispositius HAL +Comment[da]=HAL - enhedshåndtering +Comment[de]=Hardware-Informationen anzeigen +Comment[fa]=مدیر سخت افزار HAL +Comment[fi]=HAL-laitehallinta +Comment[fr]=Gestionnaire de périphériques HAL +Comment[hu]=HAL eszközkezelő +Comment[it]=Gestore delle periferiche HAL +Comment[nl]=HAL apparaatbeheer +Comment[pt]=Gestor de dispositivos HAL +Comment[pt_BR]=Gerenciador de dispositivos HAL +Exec=hal-device-manager +Icon=hwbrowser +StartupNotify=true +Terminal=false +Type=Application +Categories=GNOME;Application;Settings;System; +X-Ubuntu-Gettext-Domain=hal --- hal-0.5.7.1.orig/debian/pycompat +++ hal-0.5.7.1/debian/pycompat @@ -0,0 +1 @@ +2 --- hal-0.5.7.1.orig/debian/hal.prerm +++ hal-0.5.7.1/debian/hal.prerm @@ -0,0 +1,7 @@ +#!/bin/sh -e + +if [ "$1" = "remove" ]; then + /etc/dbus-1/event.d/20hal stop || true +fi + +#DEBHELPER# --- hal-0.5.7.1.orig/debian/hal-device-manager.1 +++ hal-0.5.7.1/debian/hal-device-manager.1 @@ -0,0 +1,46 @@ +.\" Hey, EMACS: \-*\- nroff \-*\- +.\" First parameter, NAME, should be all caps +.\" Second parameter, SECTION, should be 1\-8, maybe w/ subsection +.\" other parameters are allowed: see man(7), man(1) +.TH HAL\-DEVICE\-MANAGER 1 "September 21, 2004" +.\" Please adjust this date whenever revising the manpage. +.\" +.\" Some roff macros, for reference: +.\" .nh disable hyphenation +.\" .hy enable hyphenation +.\" .ad l left justify +.\" .ad b justify to both left and right margins +.\" .nf disable filling +.\" .fi enable filling +.\" .br insert line break +.\" .sp insert n+1 empty lines +.\" for manpage\-specific macros, see man(7) + +.SH NAME +hal\-device\-manager \- Show devices and their properties + +.SH SYNOPSIS +.BR hal\-device\-manager + +.SH DESCRIPTION +Shows a list of all devices with their properties. + +.\" TeX users may be more comfortable with the \fB\fP and +.\" \fI\fP escape sequences to invode bold face and italics, +.\" respectively. + +.SH OPTIONS +This program accepts all the standard GNOME and GTK+ options, which +follow the usual GNU command line syntax, with long options +starting with two dashes (`\-'). + +.SH SEE ALSO +.BR lshal (1), +.BR hal\-get\-property (1), +.BR hal\-set\-property (1). +.br +For more information visit http://freedesktop.org/Software/hal + +.SH AUTHOR +This manual page was written by Sjoerd Simons , +for the Debian project (but may be used by others). --- hal-0.5.7.1.orig/debian/hal-cpu.png.uuencode +++ hal-0.5.7.1/debian/hal-cpu.png.uuencode @@ -0,0 +1,25 @@ +begin 644 hal-0.4.7/tools/device-manager/hal-cpu.png.uuencode +MB5!.1PT*&@H````-24A$4@```!`````0"`8````?\_]A````!F)+1T0`_P#_ +M`/^@O:>3````"7!(67,```L3```+$P$`FIP8````!W1)344'U0$>%@`%:T`% +M;0```!UT15AT0V]M;65N=`!#G"+ESHKBA=%(N+H2M_0'$QW1A9/G`XA\.!_]39V/'F"HBA,3T__C\W,S-S9\`"L +MK*R0S^<_'AT=_4I*&0B%0KE,)O-97U_?YN#@8$91%*_?[\^ET^G/N[N[-P<& +M!M*3DY.?;&QLH`#,S#X^)AX/$XFD^'L[`R`4JD$@&59M-MM/!X/ +M4DHZ?!V^QV./HFJM5F-U=?6H4JF@JBJ93`:OUTNE4F%_?Y^>GAZ"P2!=75TH +MBD(D$J'5:O';ULO;E[__61;!8)"EI:7OPN%P3ZO5`J!0*!`*A4@FDVB:1K5: +MQ7$7;U3#,%A;6\OZ?#X,P\"V;4Y.3M`TC60R2;U> +MIZ.C@U:KA=_OQS`,I)1L9K-2:*+L`9B:FAHM%HLT&@WR^3RI5`K7==G9V2&? +MS]-NMW$F)1J/$XW$C%HM1K]?Q>KT<'1T1"`10 +M516OUXNJJIBF"4`X'$;7=6PIU;&Q1Q%AFB;;V]N#(R,CCVW;)A*)<'Y^CL_G +MP[9M-$U#TS2DE"B*@J[K&(;!BZT7%W^]+OP@_'X_\_/SWP2#P;Y:K8;KNEQ? +M7R.$P+9M:K4:IFGBNBZ:IF%9%M5JE0>I=VXMVWJCFJ;)^OKZKW>)S6;S_N?E +M`7^[K+B\O`WPY,3'Q$?!^.IW^ +C>GAX^+VWV`=OL2_N?/\";#>;,;E9VM$`````245.1*Y"8((` +` +end --- hal-0.5.7.1.orig/debian/patches/16-nonpartitions-ending-in-nums.patch +++ hal-0.5.7.1/debian/patches/16-nonpartitions-ending-in-nums.patch @@ -0,0 +1,17 @@ +diff -Nur ubuntu/build-tree/hal-0.5.7.1/hald/linux2/hotplug.c ubuntu.new/build-tree/hal-0.5.7.1/hald/linux2/hotplug.c +--- hal-0.5.7.1/hald/linux2/hotplug.c 2006-07-26 20:03:17.000000000 +0200 ++++ hal-0.5.7.1/hald/linux2/hotplug.c 2006-08-23 12:52:59.000000000 +0200 +@@ -285,6 +285,13 @@ + is_partition = isdigit(hotplug_event->sysfs.sysfs_path[len - 1]) || + strstr (hotplug_event->sysfs.sysfs_path, "/fakevolume") ; + ++ /* /sys/block/ has a guaranteed structure of being device/partition */ ++ if (strncmp(hotplug_event->sysfs.sysfs_path, "/sys/block/", 11) == 0 && ++ !strchr(hotplug_event->sysfs.sysfs_path + 11, '/')) { ++ HAL_INFO(("hotplug_event->sysfs.sysfs_path %s is not a partition\n", hotplug_event->sysfs.sysfs_path)); ++ is_partition = 0; ++ } ++ + if (hotplug_event->action == HOTPLUG_ACTION_ADD) { + HalDevice *parent = NULL; + --- hal-0.5.7.1.orig/debian/patches/11-hdm-nice-keyvalues.patch +++ hal-0.5.7.1/debian/patches/11-hdm-nice-keyvalues.patch @@ -0,0 +1,21 @@ +diff -ruN hal-0.5.7-old/tools/device-manager/DeviceManager.py hal-0.5.7/tools/device-manager/DeviceManager.py +--- hal-0.5.7-old/tools/device-manager/DeviceManager.py 2005-11-08 16:47:36.000000000 +0100 ++++ hal-0.5.7/tools/device-manager/DeviceManager.py 2006-03-27 16:40:35.000000000 +0200 +@@ -360,7 +360,7 @@ + category.set_label("Unknown") + + if device.properties.has_key("info.capabilities"): +- capabilities.set_label("%s"%device.properties["info.capabilities"]) ++ capabilities.set_label(", ".join(device.properties["info.capabilities"])) + else: + capabilities.set_label("Unknown") + +@@ -454,6 +454,8 @@ + store.set(iter, 0, p, 1, "bool", 2, "false") + elif ptype==float: + store.set(iter, 0, p, 1, "float", 2, "%f"%val) ++ elif ptype==list: ++ store.set(iter, 0, p, 1, "list", 2, ", ".join(val)) + else: + # assume strlist + store.set(iter, 0, p, 1, "strlist", 2, val) --- hal-0.5.7.1.orig/debian/patches/00upstream-02-mWh-conversion.patch +++ hal-0.5.7.1/debian/patches/00upstream-02-mWh-conversion.patch @@ -0,0 +1,75 @@ +From: Richard Hughes +Date: Mon, 21 Aug 2006 16:33:40 +0000 (+0100) +Subject: properly convert mAh to mWh rather than uWh +X-Git-Tag: HAL_0_5_8 +X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=b30d1320614564d226018b8a491ee4f70567db64 + +properly convert mAh to mWh rather than uWh + +We should convert the mAh reading (battery.reporting.rate) into mWh +(battery.charge_level.rate) by multiplying it by the voltage (in Volts), +but we are multiplying it by the voltage in mV, and so the rate information +is a factor of 3 too large. This *really* breaks calculating the time +for multibattery laptops. +--- + +--- a/hald/linux2/acpi.c ++++ b/hald/linux2/acpi.c +@@ -151,13 +151,13 @@ battery_refresh_poll (HalDevice *d) + voltage = hal_device_property_get_int (d, "battery.voltage.current"); + + /* Just in case we don't get design voltage information, then +- * this will pretend that we have 1mV. This degrades our ++ * this will pretend that we have 1V. This degrades our + * ability to report accurate times on multi-battery systems + * but will always prevent negative charge levels and allow + * accurate reporting on single-battery systems. + */ + if (design_voltage <= 0) +- design_voltage = 1; ++ design_voltage = 1000; /* mV */ + + /* If the current voltage is unknown or greater than design, + * then use design voltage. +@@ -165,9 +165,9 @@ battery_refresh_poll (HalDevice *d) + if (voltage <= 0 || voltage > design_voltage) + voltage = design_voltage; + +- normalised_current = reporting_current * voltage; +- normalised_lastfull = reporting_lastfull * voltage; +- normalised_rate = reporting_rate * voltage; ++ normalised_current = (reporting_current * voltage) / 1000; ++ normalised_lastfull = (reporting_lastfull * voltage) / 1000; ++ normalised_rate = (reporting_rate * voltage) / 1000; + } else { + /* + * handle as if mWh, which is the most common case. +@@ -516,21 +516,21 @@ battery_refresh_add (HalDevice *d, const + } else if (reporting_unit && strcmp (reporting_unit, "mAh") == 0) { + voltage_design = hal_device_property_get_int (d, "battery.voltage.design"); + +- /* If design voltage is unknown, use 1mV. */ ++ /* If design voltage is unknown, use 1V. */ + if (voltage_design <= 0) +- voltage_design = 1; ++ voltage_design = 1000; /* mV */; + + /* scale by factor battery.voltage.design */ + hal_device_property_set_int (d, "battery.charge_level.design", +- reporting_design * voltage_design); ++ (reporting_design * voltage_design) / 1000); + hal_device_property_set_int (d, "battery.charge_level.warning", +- reporting_warning * voltage_design); ++ (reporting_warning * voltage_design) / 1000); + hal_device_property_set_int (d, "battery.charge_level.low", +- reporting_low * voltage_design); ++ (reporting_low * voltage_design) / 1000); + hal_device_property_set_int (d, "battery.charge_level.granularity_1", +- reporting_gran1 * voltage_design); ++ (reporting_gran1 * voltage_design) / 1000); + hal_device_property_set_int (d, "battery.charge_level.granularity_2", +- reporting_gran2 * voltage_design); ++ (reporting_gran2 * voltage_design) / 1000); + + /* set unit */ + hal_device_property_set_string (d, "battery.charge_level.unit", --- hal-0.5.7.1.orig/debian/patches/is_mounted_read_only_property.patch +++ hal-0.5.7.1/debian/patches/is_mounted_read_only_property.patch @@ -0,0 +1,115 @@ +=================================================================== +RCS file: /srv/anoncvs.freedesktop.org/cvs/hal/hal/libhal-storage/libhal-storage.h,v +rcsdiff: /srv/anoncvs.freedesktop.org/cvs/hal/hal/libhal-storage/libhal-storage.h,v: warning: Unknown phrases like `commitid ...;' are present. +retrieving revision 1.18 +retrieving revision 1.19 +diff -u -r1.18 -r1.19 +--- libhal-storage.h 2006/02/25 20:38:23 1.18 ++++ hal/libhal-storage/libhal-storage.h 2006/03/10 18:46:16 1.19 +@@ -281,6 +281,7 @@ + const char *libhal_volume_get_fsversion (LibHalVolume *volume); + LibHalVolumeUsage libhal_volume_get_fsusage (LibHalVolume *volume); + dbus_bool_t libhal_volume_is_mounted (LibHalVolume *volume); ++dbus_bool_t libhal_volume_is_mounted_read_only (LibHalVolume *volume); + dbus_bool_t libhal_volume_is_partition (LibHalVolume *volume); + dbus_bool_t libhal_volume_is_disc (LibHalVolume *volume); + unsigned int libhal_volume_get_partition_number (LibHalVolume *volume); +=================================================================== +RCS file: /srv/anoncvs.freedesktop.org/cvs/hal/hal/hald/linux2/blockdev.c,v +rcsdiff: /srv/anoncvs.freedesktop.org/cvs/hal/hal/hald/linux2/blockdev.c,v: warning: Unknown phrases like `commitid ...;' are present. +retrieving revision 1.38 +retrieving revision 1.39 +diff -u -r1.38 -r1.39 +--- blockdev.c 2006/02/24 04:29:06 1.38 ++++ hal/hald/linux2/blockdev.c 2006/03/10 18:46:16 1.39 +@@ -228,9 +228,13 @@ + /* found entry for this device in /proc/mounts */ + device_property_atomic_update_begin (); + hal_device_property_set_bool (dev, "volume.is_mounted", TRUE); ++ hal_device_property_set_bool (dev, "volume.is_mounted_read_only", ++ hasmntopt (&mnt, MNTOPT_RO) ? TRUE : FALSE); + hal_device_property_set_string (dev, "volume.mount_point", mnt.mnt_dir); + device_property_atomic_update_end (); +- HAL_INFO ((" set %s to be mounted at %s", hal_device_get_udi (dev), mnt.mnt_dir)); ++ HAL_INFO ((" set %s to be mounted at %s (%s)", ++ hal_device_get_udi (dev), mnt.mnt_dir, ++ hasmntopt (&mnt, MNTOPT_RO) ? "ro" : "rw")); + volumes = g_slist_delete_link (volumes, volume); + break; + } +@@ -247,6 +251,7 @@ + mount_point = g_strdup (hal_device_property_get_string (dev, "volume.mount_point")); + device_property_atomic_update_begin (); + hal_device_property_set_bool (dev, "volume.is_mounted", FALSE); ++ hal_device_property_set_bool (dev, "volume.is_mounted_read_only", FALSE); + hal_device_property_set_string (dev, "volume.mount_point", ""); + device_property_atomic_update_end (); + HAL_INFO (("set %s to unmounted", hal_device_get_udi (dev))); +@@ -924,6 +929,7 @@ + hal_device_property_set_string (d, "volume.label", ""); + hal_device_property_set_string (d, "volume.mount_point", ""); + hal_device_property_set_bool (d, "volume.is_mounted", FALSE); ++ hal_device_property_set_bool (d, "volume.is_mounted_read_only", FALSE); + hal_device_property_set_bool ( + d, "volume.is_disc", + strcmp (hal_device_property_get_string (parent, "storage.drive_type"), "cdrom") == 0); +=================================================================== +RCS file: /srv/anoncvs.freedesktop.org/cvs/hal/hal/doc/spec/hal-spec.xml.in,v +rcsdiff: /srv/anoncvs.freedesktop.org/cvs/hal/hal/doc/spec/hal-spec.xml.in,v: warning: Unknown phrases like `commitid ...;' are present. +retrieving revision 1.68 +retrieving revision 1.69 +diff -u -r1.68 -r1.69 +--- hal-spec.xml.in 2006/03/08 05:15:47 1.68 ++++ hal/doc/spec/hal-spec.xml.in 2006/03/10 18:46:16 1.69 +@@ -2525,6 +2525,14 @@ + This property is TRUE if and only if the volume is mounted + + ++ volume.is_mounted_read_only (bool) ++ ++ Yes ++ This property is TRUE if and only if the volume is mounted and ++ the volume's file-system is read-only. ++ ++ ++ + volume.mount_point (string) + example: /media/compact_flash1 + Yes (is blank only when volume.is_mounted is FALSE) +=================================================================== +RCS file: /srv/anoncvs.freedesktop.org/cvs/hal/hal/libhal-storage/libhal-storage.c,v +rcsdiff: /srv/anoncvs.freedesktop.org/cvs/hal/hal/libhal-storage/libhal-storage.c,v: warning: Unknown phrases like `commitid ...;' are present. +retrieving revision 1.33 +retrieving revision 1.34 +diff -u -r1.33 -r1.34 +--- libhal-storage.c 2006/02/25 20:38:23 1.33 ++++ hal/libhal-storage/libhal-storage.c 2006/03/10 18:46:16 1.34 +@@ -722,6 +722,7 @@ + char *device_file; + char *volume_label; /* may be NULL, is never "" */ + dbus_bool_t is_mounted; ++ dbus_bool_t is_mounted_read_only; /* TRUE iff is_mounted and r/o fs */ + char *mount_point; /* NULL iff !is_mounted */ + char *fstype; /* NULL iff !is_mounted or unknown */ + char *fsversion; +@@ -1108,6 +1109,7 @@ + LIBHAL_PROP_EXTRACT_STRING ("volume.fstype", vol->fstype); + LIBHAL_PROP_EXTRACT_STRING ("volume.fsversion", vol->fsversion); + LIBHAL_PROP_EXTRACT_BOOL ("volume.is_mounted", vol->is_mounted); ++ LIBHAL_PROP_EXTRACT_BOOL ("volume.is_mounted_read_only", vol->is_mounted_read_only); + LIBHAL_PROP_EXTRACT_STRING ("volume.fsusage", vol_fsusage_textual); + LIBHAL_PROP_EXTRACT_STRING ("volume.uuid", vol->uuid); + +@@ -1453,6 +1455,12 @@ + } + + dbus_bool_t ++libhal_volume_is_mounted_read_only (LibHalVolume *volume) ++{ ++ return volume->is_mounted_read_only; ++} ++ ++dbus_bool_t + libhal_volume_is_partition (LibHalVolume *volume) + { + return volume->is_partition; --- hal-0.5.7.1.orig/debian/patches/readme-remove-hacking.patch +++ hal-0.5.7.1/debian/patches/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.7.1.orig/debian/patches/13_probe_input_endianess.patch.disabled +++ hal-0.5.7.1/debian/patches/13_probe_input_endianess.patch.disabled @@ -0,0 +1,44 @@ +diff -ruN hal-0.5.7-old/hald/linux2/probing/probe-input.c hal-0.5.7/hald/linux2/probing/probe-input.c +--- hal-0.5.7-old/hald/linux2/probing/probe-input.c 2006-02-23 19:31:52.000000000 +0100 ++++ hal-0.5.7/hald/linux2/probing/probe-input.c 2006-05-09 09:08:31.000000000 +0200 +@@ -42,13 +42,19 @@ + + #include "shared.h" + +-#define test_bit(bit, array) (array[(bit) / 8] & (1 << ((bit) % 8))) ++/* we must use this kernel-compatible implementation */ ++#define BITS_PER_LONG (sizeof(long) * 8) ++#define NBITS(x) ((((x)-1)/BITS_PER_LONG)+1) ++#define OFF(x) ((x)%BITS_PER_LONG) ++#define BIT(x) (1UL<> OFF(bit)) & 1) + + static void + check_abs (int fd, LibHalContext *ctx, const char *udi) + { +- char bitmask[(ABS_MAX + 7) / 8]; +- char bitmask_touch[(KEY_MAX + 7) / 8]; ++ long bitmask[NBITS(ABS_MAX)]; ++ long bitmask_touch[NBITS(KEY_MAX)]; + DBusError error; + + if (ioctl (fd, EVIOCGBIT(EV_ABS, sizeof (bitmask)), bitmask) < 0) { +@@ -81,7 +87,7 @@ + check_key (int fd, LibHalContext *ctx, const char *udi) + { + unsigned int i; +- char bitmask[(KEY_MAX + 7) / 8]; ++ long bitmask[NBITS(KEY_MAX)]; + int is_keyboard; + DBusError error; + +@@ -112,7 +118,7 @@ + static void + check_rel (int fd, LibHalContext *ctx, const char *udi) + { +- char bitmask[(REL_MAX + 7) / 8]; ++ long bitmask[NBITS(REL_MAX)]; + DBusError error; + + if (ioctl (fd, EVIOCGBIT(EV_REL, sizeof (bitmask)), bitmask) < 0) { --- hal-0.5.7.1.orig/debian/patches/12_refresh_acpi_states.patch +++ hal-0.5.7.1/debian/patches/12_refresh_acpi_states.patch @@ -0,0 +1,39 @@ +diff -Nur hal-0.5.7/tools/hal-system-power-hibernate hal-0.5.7.new/build-tree/hal-0.5.7/tools/hal-system-power-hibernate +--- hal-0.5.7/tools/hal-system-power-hibernate 2006-05-08 15:04:50.789766728 +0100 ++++ hal-0.5.7/tools/hal-system-power-hibernate 2006-05-08 15:05:19.234442480 +0100 +@@ -53,4 +53,15 @@ + fi + fi + ++#Refresh devices as a resume can do funny things ++for type in button battery ac_adapter ++do ++ devices=`hal-find-by-capability --capability $type` ++ for device in $devices ++ do ++ dbus-send --system --print-reply --dest=org.freedesktop.Hal \ ++ $device org.freedesktop.Hal.Device.Rescan ++ done ++done ++ + exit $RET +diff -Nur hal-0.5.7/tools/hal-system-power-suspend hal-0.5.7.new/build-tree/hal-0.5.7/tools/hal-system-power-suspend +--- hal-0.5.7/tools/hal-system-power-suspend 2006-05-08 15:04:50.789766728 +0100 ++++ hal-0.5.7/tools/hal-system-power-suspend 2006-05-08 15:06:21.701945976 +0100 +@@ -71,4 +71,16 @@ + echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2 + exit 1 + fi ++ ++#Refresh devices as a resume can do funny things ++for type in button battery ac_adapter ++do ++ devices=`hal-find-by-capability --capability $type` ++ for device in $devices ++ do ++ dbus-send --system --print-reply --dest=org.freedesktop.Hal \ ++ $device org.freedesktop.Hal.Device.Rescan ++ done ++done ++ + exit $RET --- hal-0.5.7.1.orig/debian/patches/00upstream-01-music-players-fdi.patch +++ hal-0.5.7.1/debian/patches/00upstream-01-music-players-fdi.patch @@ -0,0 +1,910 @@ +diff -Nur hal/build-tree/hal-0.5.7.1/fdi/information/10freedesktop/10-usb-music-players.fdi hal.new/build-tree/hal-0.5.7.1/fdi/information/10freedesktop/10-usb-music-players.fdi +--- hal-0.5.7.1/fdi/information/10freedesktop/10-usb-music-players.fdi 2006-02-04 18:27:35.000000000 +0100 ++++ hal-0.5.7.1/fdi/information/10freedesktop/10-usb-music-players.fdi 2006-09-12 09:52:53.000000000 +0200 +@@ -1,4 +1,4 @@ +- ++ + + + +@@ -34,10 +34,35 @@ + + + +- +- +- ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/x-wav ++ ++ ++ + portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ portable_audio_player + portable_audio_player + generic + storage +@@ -46,10 +71,70 @@ + audio/x-ms-wma + audio/x-wav + +- +- +- ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ + ++ + + portable_audio_player + portable_audio_player +@@ -64,13 +149,9 @@ + sd_mmc + + +- +- +- +- +- +- +- portable_audio_player ++ ++ ++ portable_audio_player + portable_audio_player + generic + storage +@@ -78,10 +159,10 @@ + audio/mpeg + audio/x-ms-wma + application/ogg +- audio/mpeg ++ audio/x-wav + +- +- ++ ++ + portable_audio_player + portable_audio_player + generic +@@ -89,33 +170,81 @@ + info.udi + audio/mpeg + audio/x-ms-wma +- audio/mpeg ++ audio/x-wav + +- +- +- portable_audio_player ++ ++ ++ ++ ++ ++ ++ portable_audio_player + portable_audio_player + generic + storage + info.udi ++ audio/x-ms-wma + audio/mpeg +- audio/x-ms-wma + audio/mpeg ++ PLAYER/ + +- +- ++ ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ application/ogg ++ audio/mpeg ++ ++ ++ + portable_audio_player + portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ application/ogg ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player + generic + storage + info.udi + audio/mpeg + audio/x-ms-wma +- audio/mpeg +- +- +- +- portable_audio_player ++ application/ogg ++ audio/x-wav ++ audio/x-wav ++ MUSIC/ ++ ++ ++ ++ portable_audio_player + portable_audio_player + generic + storage +@@ -123,11 +252,16 @@ + audio/mpeg + audio/x-ms-wma + application/ogg +- audio/mpeg +- +- +- +- portable_audio_player ++ audio/x-wav ++ audio/x-wav ++ Music/ ++ audio/x-mpegurl ++ audio/x-scpls ++ Playlists/ ++ ++ ++ ++ portable_audio_player + portable_audio_player + generic + storage +@@ -135,22 +269,29 @@ + audio/mpeg + audio/x-ms-wma + application/ogg +- audio/mpeg ++ audio/x-wav ++ audio/x-wav + +- +- ++ ++ ++ ++ ++ ++ + portable_audio_player + portable_audio_player + generic + storage + info.udi + audio/mpeg +- audio/x-ms-wma +- application/ogg ++ audio/vnd.sony.atrac3 + audio/mpeg + +- +- ++ ++ ++ ++ ++ + portable_audio_player + portable_audio_player + generic +@@ -158,11 +299,35 @@ + info.udi + audio/mpeg + audio/x-ms-wma +- application/ogg +- audio/mpeg ++ audio/x-wav + +- +- ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ ++ sd_mmc ++ ++ ++ ++ + portable_audio_player + portable_audio_player + generic +@@ -170,34 +335,263 @@ + info.udi + audio/mpeg + audio/x-ms-wma ++ audio/x-wav ++ ++ ++ ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma + application/ogg + audio/mpeg + +- +- ++ ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/audible ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ ++ ++ ++ + portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/audible ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ ++ ++ ++ portable_audio_player + portable_audio_player + generic + storage + info.udi + audio/mpeg + audio/x-ms-wma +- application/ogg +- audio/mpeg ++ audio/x-wav ++ ++ sd_mmc ++ + +- +- ++ ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ application/ogg ++ audio/x-ms-wma ++ audio/flac ++ audio/x-wav ++ audio/mpeg ++ MUSIC/ ++ audio/x-mpegurl ++ PLAYLIST/%File ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ application/ogg ++ audio/x-ms-wma ++ audio/flac ++ audio/x-wav ++ audio/mpeg ++ MUSIC/ ++ audio/x-mpegurl ++ PLAYLIST/%File ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ application/ogg ++ audio/x-ms-wma ++ audio/flac ++ audio/x-wav ++ audio/mpeg ++ MUSIC/ ++ audio/x-mpegurl ++ PLAYLIST/%File ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ application/ogg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/mpeg ++ audio/x-mpegurl ++ PLAYLIST/%File ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ application/ogg ++ audio/x-ms-wma ++ audio/flac ++ audio/x-wav ++ audio/mpeg ++ MUSIC/ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ application/ogg ++ audio/x-ms-wma ++ audio/flac ++ audio/x-wav ++ audio/mpeg ++ MUSIC/ ++ ++ ++ + portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ application/ogg ++ audio/x-ms-wma ++ audio/flac ++ audio/x-wav ++ audio/mpeg ++ MUSIC ++ VOICE ++ RECORD ++ audio/x-mpegurl ++ PLAYLIST/%File ++ MUSIC ++ RECORDS/FM ++ RECORDS/LINEIN ++ RECORDS/VOICE ++ ++ ++ ++ ++ ++ ++ ++ portable_audio_player + portable_audio_player + generic + storage + info.udi + audio/mpeg ++ audio/x-wav + audio/x-ms-wma +- application/ogg ++ audio/x-wav ++ Music/ ++ audio/x-mpegurl ++ Playlist/ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi + audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav + ++ ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-wav ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/aac ++ audio/x-wav ++ + ++ + + + +@@ -247,10 +641,25 @@ + audio/mpeg + + +- +- +- +- ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-wav ++ ++ ++ ++ ++ ++ ++ + portable_audio_player + portable_audio_player + generic +@@ -258,12 +667,63 @@ + info.udi + audio/mpeg + audio/x-ms-wma +- application/ogg +- video/x-ms-asf +- audio/mpeg +- +- +- ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ application/ogg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-wav ++ ++ ++ ++ ++ ++ ++ ++ ROKR e2 ++ Motorola ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/aac ++ audio/x-wav ++ ++ ++ ++ ++ ++ ++ + portable_audio_player + portable_audio_player + generic +@@ -272,8 +732,125 @@ + audio/mpeg + audio/x-ms-wma + application/ogg +- audio/x-wav +- ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ application/ogg ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ application/ogg ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ application/ogg ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ application/ogg ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ application/ogg ++ audio/mpeg ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ application/ogg ++ audio/mpeg ++ ++ + + + +@@ -281,6 +858,46 @@ + + + ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ user ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/mpeg ++ audio/x-wav ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ user ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/x-wav ++ Music/ ++ audio/x-mpegurl ++ Playlists/%File ++ ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ user ++ audio/mpeg ++ ++ + + + +@@ -401,16 +1018,7 @@ + audio/mpeg + + +- +- +- +- portable_audio_player +- portable_audio_player +- generic +- user +- audio/mpeg +- +- ++ + + + --- hal-0.5.7.1.orig/debian/patches/10_volume_and_aliased_keys.patch +++ hal-0.5.7.1/debian/patches/10_volume_and_aliased_keys.patch @@ -0,0 +1,55 @@ +--- hal/hald/linux2/addons/addon-keyboard.c.orig 2006-02-22 21:10:06.000000000 +0000 ++++ hal/hald/linux2/addons/addon-keyboard.c 2006-03-27 15:38:38.000000000 +0100 +@@ -6,6 +6,7 @@ + * Copyright (C) 2005 David Zeuthen, + * Copyright (C) 2005 Ryan Lortie + * Copyright (C) 2006 Matthew Garrett ++ * Copyright (C) 2006 Paul Sladen + * + * 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 +@@ -45,8 +46,18 @@ + + static char *udi; + ++/* Waiting to will be assigned upstream in 'input.h' */ ++#ifndef KEY_BATTERY ++#define KEY_BATTERY 236 ++#endif ++ + static char *key_name[KEY_MAX + 1] = { + [0 ... KEY_MAX] = NULL, ++ [KEY_MACRO] = "macro", ++ [KEY_MUTE] = "mute", ++ [KEY_VOLUMEDOWN] = "volumedown", ++ [KEY_VOLUMEUP] = "volumeup", ++ [KEY_POWER] = "power", + [KEY_STOP] = "stop", + [KEY_AGAIN] = "again", + [KEY_PROPS] = "props", +@@ -106,11 +117,11 @@ + [KEY_F16] = "f16", + [KEY_F17] = "f17", + [KEY_F18] = "f18", +- [KEY_F19] = "f19", +- [KEY_F20] = "f20", +- [KEY_F21] = "f21", +- [KEY_F22] = "f22", +- [KEY_F23] = "f23", ++ [KEY_F19] = "light", // Unassigned, aliased key ++ [KEY_F20] = "videoout", // Unassigned, aliased key ++ [KEY_F21] = "rotatescreen", // Unassigned, aliased key ++ [KEY_F22] = "videomodecycle", // Unassigned, aliased key ++ [KEY_F23] = "presentation", // Unassigned, aliased key + [KEY_F24] = "f24", + [KEY_PLAYCD] = "playcd", + [KEY_PAUSECD] = "pausecd", +@@ -138,7 +149,7 @@ + [KEY_BRIGHTNESSDOWN] = "brightnessdown", + [KEY_BRIGHTNESSUP] = "brightnessup", + [KEY_MEDIA] = "media", +- [KEY_POWER] = "power" ++ [KEY_BATTERY] = "battery" + }; + + static void --- hal-0.5.7.1.orig/debian/patches/15-fix-omnibook-brightness-levels.patch +++ hal-0.5.7.1/debian/patches/15-fix-omnibook-brightness-levels.patch @@ -0,0 +1,12 @@ +diff -Nur hal-0.5.7/build-tree/hal-0.5.7/hald/linux2/acpi.c hal-0.5.7.new/build-tree/hal-0.5.7/hald/linux2/acpi.c +--- hal-0.5.7/build-tree/hal-0.5.7/hald/linux2/acpi.c 2006-02-18 23:11:23 +0000 ++++ hal-0.5.7/hald/linux2/acpi.c 2006-05-16 12:39:31 +0100 +@@ -697,7 +697,7 @@ + } else if (acpi_type == ACPI_TYPE_OMNIBOOK_DISPLAY) { + type = "omnibook"; + desc = "Omnibook LCD Panel"; +- br_levels = 8; ++ br_levels = 11; + } else { + type = "unknown"; + desc = "Unknown LCD Panel"; --- hal-0.5.7.1.orig/debian/patches/09_sony_brightness.patch +++ hal-0.5.7.1/debian/patches/09_sony_brightness.patch @@ -0,0 +1,12 @@ +diff -ruN hal-0.5.7-old/tools/hal-system-lcd-set-brightness hal-0.5.7/tools/hal-system-lcd-set-brightness +--- hal-0.5.7-old/tools/hal-system-lcd-set-brightness 2006-03-15 23:01:12.000000000 +0100 ++++ hal-0.5.7/tools/hal-system-lcd-set-brightness 2006-03-15 23:04:54.000000000 +0100 +@@ -60,7 +60,7 @@ + elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony" ]; then + # echo "{1..8}" > /proc/acpi/sony/brightness + # http://popies.net/sonypi/2.6-sony_acpi4.patch +- echo "$value" > $HAL_PROP_LINUX_ACPI_PATH ++ echo "$((value + 1))" > $HAL_PROP_LINUX_ACPI_PATH + elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "omnibook" ]; then + # echo "{0..7}" > /proc/omnibook/lcd + # http://bugzilla.gnome.org/show_bug.cgi?id=331458 --- hal-0.5.7.1.orig/debian/patches/02_ignored_volumes.patch +++ hal-0.5.7.1/debian/patches/02_ignored_volumes.patch @@ -0,0 +1,20 @@ +diff -ruN hal-0.5.7-old/fdi/policy/10osvendor/20-storage-methods.fdi hal-0.5.7/fdi/policy/10osvendor/20-storage-methods.fdi +--- hal-0.5.7-old/fdi/policy/10osvendor/20-storage-methods.fdi 2006-02-22 15:12:23.000000000 +0100 ++++ hal-0.5.7/fdi/policy/10osvendor/20-storage-methods.fdi 2006-03-20 11:54:14.000000000 +0100 +@@ -71,6 +71,16 @@ + false + + ++ true ++ ++ ++ ++ ++ ++ false ++ ++ ++ + + + --- hal-0.5.7.1.orig/debian/patches/00upstream-04-dont-overwrite-formfactor.patch +++ hal-0.5.7.1/debian/patches/00upstream-04-dont-overwrite-formfactor.patch @@ -0,0 +1,180 @@ +From: Danny Kukawka +Date: Sun, 21 May 2006 00:58:24 +0000 (+0000) +Subject: Fixed mapping of system.formfactor from smbios.chassis.type. Added a check +X-Git-Tag: HAL_0_5_8 +X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=f70301c8f426618d52a31d33c846989b1c8e7a52 + +Fixed mapping of system.formfactor from smbios.chassis.type. Added a check + if the key is already set to avoid overwrite values e.g. set in the + ACPI/APM/PMU code. Added check for exit_type to skip mapping if + execution of the smbios prober failed. (osspec_probe): Removed set + default value for system.formfactor for all cases and readded to case + if !should_decode_dmi is set. +--- + +--- a/hald/linux2/osspec.c ++++ b/hald/linux2/osspec.c +@@ -360,14 +360,21 @@ computer_probing_helper_done (HalDevice + + static void + computer_probing_pcbios_helper_done (HalDevice *d, guint32 exit_type, +- gint return_code, gchar **error, +- gpointer data1, gpointer data2) ++ gint return_code, gchar **error, ++ gpointer data1, gpointer data2) + { + const char *chassis_type; + const char *system_manufacturer; + const char *system_product; + const char *system_version; + ++ if (exit_type == HALD_RUN_FAILED) { ++ /* set a default value */ ++ if (!hal_device_has_property (d, "system.formfactor")) ++ hal_device_property_set_string (d, "system.formfactor", "unknown"); ++ goto out; ++ } ++ + if ((system_manufacturer = hal_device_property_get_string (d, "smbios.system.manufacturer")) != NULL && + (system_product = hal_device_property_get_string (d, "smbios.system.product")) != NULL && + (system_version = hal_device_property_get_string (d, "smbios.system.version")) != NULL) { +@@ -384,57 +391,60 @@ computer_probing_pcbios_helper_done (Hal + } + + +- /* now map the smbios.* properties to our generic system.formfactor property */ +- if ((chassis_type = hal_device_property_get_string (d, "smbios.chassis.type")) != NULL) { +- unsigned int i; +- +- /* Map the chassis type from dmidecode.c to a sensible type used in hal +- * +- * See also 3.3.4.1 of the "System Management BIOS Reference Specification, +- * Version 2.3.4" document, available from http://www.dmtf.org/standards/smbios. +- * +- * TODO: figure out WTF the mapping should be; "Lunch Box"? Give me a break :-) +- */ +- static const char *chassis_map[] = { +- "Other", "unknown", +- "Unknown", "unknown", +- "Desktop", "desktop", +- "Low Profile Desktop", "desktop", +- "Pizza Box", "server", +- "Mini Tower", "desktop", +- "Tower", "desktop", +- "Portable", "laptop", +- "Laptop", "laptop", +- "Notebook", "laptop", +- "Hand Held", "handheld", +- "Docking Station", "laptop", +- "All In One", "unknown", +- "Sub Notebook", "laptop", +- "Space-saving", "unknown", +- "Lunch Box", "unknown", +- "Main Server Chassis", "server", +- "Expansion Chassis", "unknown", +- "Sub Chassis", "unknown", +- "Bus Expansion Chassis", "unknown", +- "Peripheral Chassis", "unknown", +- "RAID Chassis", "unknown", +- "Rack Mount Chassis", "unknown", +- "Sealed-case PC", "unknown", +- "Multi-system", "unknown", +- NULL +- }; +- +- for (i = 0; chassis_map[i] != NULL; i += 2) { +- if (strcmp (chassis_map[i], chassis_type) == 0) { +- /* check if the key is 'unknown' to prevent overwrite keys */ +- if (strcmp (hal_device_property_get_string (d, "system.formfactor"), "unknown")) ++ if (!hal_device_has_property (d, "system.formfactor")) { ++ /* now map the smbios.* properties to our generic system.formfactor property */ ++ if ((chassis_type = hal_device_property_get_string (d, "smbios.chassis.type")) != NULL) { ++ unsigned int i; ++ ++ /* Map the chassis type from dmidecode.c to a sensible type used in hal ++ * ++ * See also 3.3.4.1 of the "System Management BIOS Reference Specification, ++ * Version 2.3.4" document, available from http://www.dmtf.org/standards/smbios. ++ * ++ * TODO: figure out WTF the mapping should be; "Lunch Box"? Give me a break :-) ++ */ ++ static const char *chassis_map[] = { ++ "Other", "unknown", ++ "Unknown", "unknown", ++ "Desktop", "desktop", ++ "Low Profile Desktop", "desktop", ++ "Pizza Box", "server", ++ "Mini Tower", "desktop", ++ "Tower", "desktop", ++ "Portable", "laptop", ++ "Laptop", "laptop", ++ "Notebook", "laptop", ++ "Hand Held", "handheld", ++ "Docking Station", "laptop", ++ "All In One", "unknown", ++ "Sub Notebook", "laptop", ++ "Space-saving", "unknown", ++ "Lunch Box", "unknown", ++ "Main Server Chassis", "server", ++ "Expansion Chassis", "unknown", ++ "Sub Chassis", "unknown", ++ "Bus Expansion Chassis", "unknown", ++ "Peripheral Chassis", "unknown", ++ "RAID Chassis", "unknown", ++ "Rack Mount Chassis", "unknown", ++ "Sealed-case PC", "unknown", ++ "Multi-system", "unknown", ++ NULL ++ }; ++ ++ for (i = 0; chassis_map[i] != NULL; i += 2) { ++ if (strcmp (chassis_map[i], chassis_type) == 0) { + hal_device_property_set_string (d, "system.formfactor", chassis_map[i+1]); +- break; ++ break; ++ } + } ++ ++ } else { ++ /* set a default value */ ++ hal_device_property_set_string (d, "system.formfactor", "unknown"); + } +- + } +- ++out: + computer_probing_helper_done (d); + } + +@@ -509,10 +519,6 @@ osspec_probe (void) + hal_device_property_set_string (root, "system.kernel.machine", un.machine); + } + +- /* can be overridden by dmidecode, others */ +- hal_device_property_set_string (root, "system.formfactor", "unknown"); +- +- + /* Let computer be in TDL while synthesizing all other events because some may write to the object */ + hal_device_store_add (hald_get_tdl (), root); + +@@ -544,15 +550,14 @@ osspec_probe (void) + + /* TODO: add prober for PowerMac's */ + if (should_decode_dmi) { +- hald_runner_run (root, "hald-probe-smbios", NULL, +- HAL_HELPER_TIMEOUT, +- computer_probing_pcbios_helper_done, +- NULL, NULL); ++ hald_runner_run (root, "hald-probe-smbios", NULL, HAL_HELPER_TIMEOUT, ++ computer_probing_pcbios_helper_done, NULL, NULL); + } else { ++ /* set a default value, can be overridden by others */ ++ hal_device_property_set_string (root, "system.formfactor", "unknown"); + /* no probing */ + computer_probing_helper_done (root); +- } +- ++ } + } + + DBusHandlerResult --- hal-0.5.7.1.orig/debian/patches/07_suspend2.patch +++ hal-0.5.7.1/debian/patches/07_suspend2.patch @@ -0,0 +1,14 @@ +diff -ruN hal-0.5.7-old/tools/hal-system-power-suspend hal-0.5.7/tools/hal-system-power-suspend +--- hal-0.5.7-old/tools/hal-system-power-suspend 2006-05-01 22:22:24.000000000 +0200 ++++ hal-0.5.7/tools/hal-system-power-suspend 2006-05-01 22:23:30.000000000 +0200 +@@ -50,6 +50,10 @@ + if [ -x "/usr/bin/powersave" ] ; then + $POWERSAVED_SUSPEND2RAM + RET=$? ++ elif [ -x "/usr/sbin/hibernate" ] ; then ++ # Use hibernate configured for suspend-to-ram ++ /usr/sbin/hibernate -F/etc/hibernate/ram.conf ++ RET=$? + elif [ -x "/usr/sbin/pmi" ] ; then + /usr/sbin/pmi action suspend force + RET=$? --- hal-0.5.7.1.orig/debian/patches/18_fix_dbus_090_build.patch +++ hal-0.5.7.1/debian/patches/18_fix_dbus_090_build.patch @@ -0,0 +1,33 @@ +commit 2901c216a1d5867ac997e8c7805a3e530201fe71 +Author: Kay Sievers +Date: Fri Jul 14 17:46:57 2006 +0000 + + Replace dbus_connection_disconnect() with dbus_connection_close() (D-BUS + api rename) + +diff --git a/tools/hal-device.c b/tools/hal-device.c +index 06d6b22..a5b7c83 100644 +--- a/tools/hal-device.c ++++ b/tools/hal-device.c +@@ -155,7 +155,7 @@ int main(int argc, char **argv) + + libhal_ctx_shutdown(hal_ctx, &error); + libhal_ctx_free(hal_ctx); +- dbus_connection_disconnect(conn); ++ dbus_connection_close(conn); + dbus_connection_unref(conn); + dbus_error_free(&error); + +diff --git a/tools/lshal.c b/tools/lshal.c +index 8c05759..42e9907 100644 +--- a/tools/lshal.c ++++ b/tools/lshal.c +@@ -705,7 +705,7 @@ main (int argc, char *argv[]) + libhal_ctx_shutdown (hal_ctx, &error); + libhal_ctx_free (hal_ctx); + +- dbus_connection_disconnect (conn); ++ dbus_connection_close (conn); + dbus_connection_unref (conn); + + if (show_device) --- hal-0.5.7.1.orig/debian/patches/mount-scripts-pmount.patch +++ hal-0.5.7.1/debian/patches/mount-scripts-pmount.patch @@ -0,0 +1,71 @@ +diff -Nur hal/build-tree/hal-0.5.7.1/tools/hal-system-storage-eject hal.new/build-tree/hal-0.5.7.1/tools/hal-system-storage-eject +--- hal-0.5.7.1/tools/hal-system-storage-eject 2006-02-10 04:41:54.000000000 +0100 ++++ hal-0.5.7.1/tools/hal-system-storage-eject 2006-08-04 09:57:41.000000000 +0200 +@@ -31,7 +31,18 @@ + read GIVEN_EJECTOPTIONS + GIVEN_EJECTOPTIONS=${GIVEN_EJECTOPTIONS//[^a-zA-Z0-9_=[:space:]]/_} + +-RESULT=$(eject "$HAL_PROP_BLOCK_DEVICE" 2>&1) ++# check validity of user id ++if [ "$HAL_METHOD_INVOKED_BY_UID" = "0" ]; then ++ echo "Script was called with HAL_METHOD_INVOKED_BY_UID=0, aborting." >&2 ++ exit 1 ++fi ++PWD=`getent passwd "$HAL_METHOD_INVOKED_BY_UID"` || { ++ echo "User id $HAL_METHOD_INVOKED_BY_UID does not exist." >&2 ++ exit 1 ++} ++USER="`echo "$PWD" | cut -f 1 -d: | head -n 1`" ++ ++RESULT=$(su -c "eject '$HAL_PROP_BLOCK_DEVICE'" "$USER" 2>&1) + if [ $? -ne 0 ]; then + case "$RESULT" in + *busy*) +diff -Nur hal/build-tree/hal-0.5.7.1/tools/hal-system-storage-mount hal.new/build-tree/hal-0.5.7.1/tools/hal-system-storage-mount +--- hal-0.5.7.1/tools/hal-system-storage-mount 2006-02-14 19:49:55.000000000 +0100 ++++ hal-0.5.7.1/tools/hal-system-storage-mount 2006-08-04 09:57:32.000000000 +0200 +@@ -15,6 +15,20 @@ + exit 1 + fi + ++# check validity of user id ++if [ "$HAL_METHOD_INVOKED_BY_UID" = "0" ]; then ++ echo "Script was called with HAL_METHOD_INVOKED_BY_UID=0, aborting." >&2 ++ exit 1 ++fi ++PWD=`getent passwd "$HAL_METHOD_INVOKED_BY_UID"` || { ++ echo "User id $HAL_METHOD_INVOKED_BY_UID does not exist." >&2 ++ exit 1 ++} ++USER="`echo "$PWD" | cut -f 1 -d:`" ++ ++su -c "pmount-hal \"$HAL_PROP_BLOCK_DEVICE\"" "$USER" ++exit $? ++ + # check if device is already mounted + if [ "$HAL_PROP_VOLUME_IS_MOUNTED" = "true" ]; then + echo "org.freedesktop.Hal.Device.Volume.AlreadyMounted" >&2 +diff -Nur hal/build-tree/hal-0.5.7.1/tools/hal-system-storage-unmount hal.new/build-tree/hal-0.5.7.1/tools/hal-system-storage-unmount +--- hal-0.5.7.1/tools/hal-system-storage-unmount 2006-02-13 08:29:44.000000000 +0100 ++++ hal-0.5.7.1/tools/hal-system-storage-unmount 2006-08-04 09:57:39.000000000 +0200 +@@ -13,6 +13,20 @@ + exit 1 + fi + ++# check validity of user id ++if [ "$HAL_METHOD_INVOKED_BY_UID" = "0" ]; then ++ echo "Script was called with HAL_METHOD_INVOKED_BY_UID=0, aborting." >&2 ++ exit 1 ++fi ++PWD=`getent passwd "$HAL_METHOD_INVOKED_BY_UID"` || { ++ echo "User id $HAL_METHOD_INVOKED_BY_UID does not exist." >&2 ++ exit 1 ++} ++USER="`echo "$PWD" | cut -f 1 -d:`" ++ ++su -c "pumount \"$HAL_PROP_BLOCK_DEVICE\"" "$USER" ++exit $? ++ + MOUNT_POINT="$HAL_PROP_INFO_HAL_MOUNT_CREATED_MOUNT_POINT" + if [ "$MOUNT_POINT" == "" ]; then + MOUNT_POINT="$HAL_PROP_VOLUME_MOUNT_POINT" --- hal-0.5.7.1.orig/debian/patches/04_hald_scripts.patch +++ hal-0.5.7.1/debian/patches/04_hald_scripts.patch @@ -0,0 +1,211 @@ +Index: tools/hal-system-lcd-get-brightness +=================================================================== +RCS file: /cvs/hal/hal/tools/hal-system-lcd-get-brightness,v +retrieving revision 1.7 +diff -u -r1.7 hal-system-lcd-get-brightness +--- hal-0.5.7/tools/hal-system-lcd-get-brightness 18 Feb 2006 23:11:23 -0000 1.7 ++++ hal-0.5.7/tools/hal-system-lcd-get-brightness 19 Feb 2006 22:44:22 -0000 +@@ -8,13 +8,13 @@ + # (at your option) any later version. + + # Check for environment variables +-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "" ]; then ++if [ -z "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" ]; then + echo "Missing or empty environment variable(s)." >&2 + echo "This script should be started by hald." >&2 + exit 1 + fi + +-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then ++if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then + value="`hal-system-power-pmu getlcd`" + if [ $? -ne 0 ]; then + echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2 +@@ -24,37 +24,37 @@ + fi + + # Check for file existance and that it's readable +-if [ ! -r $HAL_PROP_LINUX_ACPI_PATH ]; then ++if [ ! -r "$HAL_PROP_LINUX_ACPI_PATH" ]; then + echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2 + echo "$1 not readable!" >&2 + exit 1 + fi + +-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "toshiba" ]; then ++if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "toshiba" ]; then + # cat /proc/acpi/toshiba/lcd + # brightness: 5 + # brightness_levels: 8 + value="`cat $HAL_PROP_LINUX_ACPI_PATH | grep brightness: | awk '{print $2;}'`" +-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "asus" ]; then ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "asus" ]; then + # cat /proc/acpi/asus/brn + # 5 + value="`cat $HAL_PROP_LINUX_ACPI_PATH`" +-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "panasonic" ]; then ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then + # cat /proc/acpi/pcc/brightness + # 5 + value="`cat $HAL_PROP_LINUX_ACPI_PATH`" +-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "ibm" ]; then ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then + # cat /proc/acpi/ibm/brightness + # level: 5 + # commands: up, down + # commands: level ( is 0-7) + value="`cat $HAL_PROP_LINUX_ACPI_PATH | grep level: | awk '{print $2;}'`" +-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "sony" ]; then ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony" ]; then + # cat /proc/acpi/sony/brightness + # 5 + value="`cat $HAL_PROP_LINUX_ACPI_PATH`" + let "value = ${value} - 1" +-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "omnibook" ]; then ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "omnibook" ]; then + # cat /proc/omnibook/lcd + # LCD brightness: 7 + value="`cat $HAL_PROP_LINUX_ACPI_PATH | awk '{print $3;}'`" +Index: tools/hal-system-lcd-set-brightness +=================================================================== +RCS file: /cvs/hal/hal/tools/hal-system-lcd-set-brightness,v +retrieving revision 1.7 +diff -u -r1.7 hal-system-lcd-set-brightness +--- hal-0.5.7/tools/hal-system-lcd-set-brightness 18 Feb 2006 23:11:23 -0000 1.7 ++++ hal-0.5.7/tools/hal-system-lcd-set-brightness 19 Feb 2006 22:44:23 -0000 +@@ -8,8 +8,8 @@ + # (at your option) any later version. + + # Check for environment variables +-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "" ] || +- [ "$HAL_PROP_LAPTOP_PANEL_NUM_LEVELS" == "" ] ; then ++if [ -z "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" ] || ++ [ -z "$HAL_PROP_LAPTOP_PANEL_NUM_LEVELS" ] ; then + echo "Missing or empty environment variable(s)." >&2 + echo "This script should be started by hald." >&2 + exit 1 +@@ -18,7 +18,14 @@ + # read value for set brightness + read value + +-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then ++# Check for values outside range ++if [ ${value} -lt 0 ] || [ ${value} -gt $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS ]; then ++ echo "org.freedesktop.Hal.Device.LaptopPanel.Invalid" >&2 ++ echo "Brightness has to be between 0 and $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS!" >&2 ++ exit 1 ++fi ++ ++if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "pmu" ]; then + hal-system-power-pmu setlcd $value + if [ $? -ne 0 ]; then + echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2 +@@ -28,39 +35,33 @@ + fi + + # Check for file existance and that it's writable +-if [ ! -w $HAL_PROP_LINUX_ACPI_PATH ]; then ++if [ ! -w "$HAL_PROP_LINUX_ACPI_PATH" ]; then + echo "org.freedesktop.Hal.Device.LaptopPanel.NotSupported" >&2 + echo "$1 not writable!" >&2 + exit 1 + fi + +-# Check for values outside range +-if [ ${value} -lt 0 ] || [ ${value} -gt $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS ]; then +- echo "org.freedesktop.Hal.Device.LaptopPanel.Invalid" >&2 +- echo "Brightness has to be between 0 and $HAL_PROP_LAPTOP_PANEL_NUM_LEVELS!" >&2 +- exit 1 +-fi + +-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "toshiba" ]; then ++if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "toshiba" ]; then + # echo "brightness: {0..x}" >/proc/acpi/toshiba/lcd + echo "brightness: $value" > $HAL_PROP_LINUX_ACPI_PATH +-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "asus" ]; then ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "asus" ]; then + # echo {0..15} > /proc/acpi/asus/brn + # http://www.taupro.com/wiki/ChemBook/LCDdisplayPowerConfiguration + echo "$value" > $HAL_PROP_LINUX_ACPI_PATH +-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "panasonic" ]; then ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "panasonic" ]; then + # echo {0..15} > /proc/acpi/pcc/brightness + # http://readlist.com/lists/vger.kernel.org/linux-kernel/7/36405.html + echo "$value" > $HAL_PROP_LINUX_ACPI_PATH +-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "ibm" ]; then ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "ibm" ]; then + # echo "level {0..7}" > /proc/acpi/ibm/brightness + # http://ibm-acpi.sourceforge.net/README + echo "level $value" > $HAL_PROP_LINUX_ACPI_PATH +-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "sony" ]; then ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "sony" ]; then + # echo "{1..8}" > /proc/acpi/sony/brightness + # http://popies.net/sonypi/2.6-sony_acpi4.patch + echo "$value" > $HAL_PROP_LINUX_ACPI_PATH +-elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "omnibook" ]; then ++elif [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" = "omnibook" ]; then + # echo "{0..7}" > /proc/omnibook/lcd + # http://bugzilla.gnome.org/show_bug.cgi?id=331458 + echo "$value" > $HAL_PROP_LINUX_ACPI_PATH +Index: tools/hal-system-power-hibernate +=================================================================== +RCS file: /cvs/hal/hal/tools/hal-system-power-hibernate,v +retrieving revision 1.6 +diff -u -r1.6 hal-system-power-hibernate +--- hal-0.5.7/tools/hal-system-power-hibernate 16 Jan 2006 12:47:40 -0000 1.6 ++++ hal-0.5.7/tools/hal-system-power-hibernate 19 Feb 2006 22:44:23 -0000 +@@ -43,8 +43,9 @@ + # Suspend2 tools installed + /usr/sbin/hibernate --force + RET=$? +- elif [ -w "/sys/power/state" ] ; then +- # Use the raw kernel sysfs interface ++ elif [ -w "/sys/power/state" ] && ++ [ "$HAL_PROP_POWER_MANAGEMENT_TYPE" != pmu ] ; then ++ # Use the raw kernel sysfs interface if possible (not on pmu yet) + echo "disk" > /sys/power/state + RET=$? + else +Index: tools/hal-system-power-suspend +=================================================================== +RCS file: /cvs/hal/hal/tools/hal-system-power-suspend,v +retrieving revision 1.6 +diff -u -r1.6 hal-system-power-suspend +--- hal-0.5.7/tools/hal-system-power-suspend 18 Feb 2006 23:00:55 -0000 1.6 ++++ hal-0.5.7/tools/hal-system-power-suspend 19 Feb 2006 22:44:23 -0000 +@@ -18,15 +18,6 @@ + + read seconds_to_sleep + +-#PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl +-if [ "$HAL_PROP_LAPTOP_PANEL_ACCESS_METHOD" == "pmu" ]; then +- hal-system-power-pmu sleep +- if [ $? -ne 0 ]; then +- echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2 +- exit 1 +- fi +- exit 0 +-fi + + #SuSE and ALTLinux only support powersave + if [ -f "/etc/altlinux-release" ] || [ -f "/etc/SuSE-release" ] ; then +@@ -62,6 +53,10 @@ + elif [ -x "/usr/sbin/pmi" ] ; then + /usr/sbin/pmi action suspend force + RET=$? ++ elif [ "$HAL_PROP_POWER_MANAGEMENT_TYPE" = "pmu" ]; then ++ #PMU systems cannot use /sys/power/state yet, so use a helper to issue an ioctl ++ hal-system-power-pmu sleep ++ RET=$? + elif [ -w "/sys/power/state" ] ; then + # Use the raw kernel sysfs interface + echo "mem" > /sys/power/state +@@ -72,4 +67,8 @@ + fi + fi + ++if [ $RET -ne 0 ]; then ++ echo "org.freedesktop.Hal.Device.SystemPowerManagement.NotSupported" >&2 ++ exit 1 ++fi + exit $RET --- hal-0.5.7.1.orig/debian/patches/desktop-POTFILES.patch +++ hal-0.5.7.1/debian/patches/desktop-POTFILES.patch @@ -0,0 +1,9 @@ +diff -ruN hal-0.5.7-old/po/POTFILES.in hal-0.5.7/po/POTFILES.in +--- hal-0.5.7-old/po/POTFILES.in 2006-01-26 15:32:37.000000000 +0100 ++++ hal-0.5.7/po/POTFILES.in 2006-03-27 16:34:50.000000000 +0200 +@@ -1,4 +1,5 @@ + # List of source files containing translatable strings. + # Please keep this file sorted alphabetically. ++../../debian/hal-device-manager.desktop.in + libhal-storage/libhal-storage.c + tools/device-manager/hal-device-manager.glade --- hal-0.5.7.1.orig/debian/patches/lpi.patch +++ hal-0.5.7.1/debian/patches/lpi.patch @@ -0,0 +1,22 @@ +diff -ruN hal-0.5.4-old/tools/device-manager/DeviceManager.py hal-0.5.4/tools/device-manager/DeviceManager.py +--- hal-0.5.4-old/tools/device-manager/DeviceManager.py 2005-07-15 22:28:57.000000000 +0200 ++++ hal-0.5.4/tools/device-manager/DeviceManager.py 2005-10-18 14:03:05.000000000 +0200 +@@ -1,5 +1,6 @@ + """This file contains the DeviceManager class.""" + ++import LaunchpadIntegration + import sys + import gobject + import gtk +@@ -40,6 +41,11 @@ + """Init the GUI and connect to the HAL daemon.""" + LibGladeApplication.__init__(self, Const.DATADIR + "/hal-device-manager.glade") + ++ LaunchpadIntegration.set_sourcepackagename("hal") ++ widget = self.xml.get_widget("help1_menu") ++ print widget ++ LaunchpadIntegration.add_items (widget, -1, False, True); ++ + ver = getattr(dbus, 'version', (0, 0, 0)) + if ver < (0, 40, 0): + dialog = gtk.MessageDialog(None, gtk.DIALOG_MODAL, --- hal-0.5.7.1.orig/debian/patches/00upstream-03-fs-on-partitioned-devices.patch +++ hal-0.5.7.1/debian/patches/00upstream-03-fs-on-partitioned-devices.patch @@ -0,0 +1,94 @@ +From: Kay Sievers +Date: Tue, 11 Jul 2006 00:00:35 +0000 (+0000) +Subject: If HAL finds already created partitions, it will not longer probe for a +X-Git-Tag: HAL_0_5_8 +X-Git-Url: http://gitweb.freedesktop.org/?p=hal.git;a=commitdiff;h=2c98ffc8dac7ee161042355790256d836e4028f9 + +If HAL finds already created partitions, it will not longer probe for a + filesystem on the disk. This should work with kernel 2.6.17. +--- + +--- a/ChangeLog ++++ b/ChangeLog +@@ -1,5 +1,11 @@ + 2006-07-11 Kay Sievers + ++ * hald/linux2/probing/probe-storage.c: (main): ++ If HAL finds already created partitions, it will not longer probe ++ for a filesystem on the disk. This should work with kernel 2.6.17. ++ ++2006-07-11 Kay Sievers ++ + * configure.in: + * hald/linux2/probing/Makefile.am: + * hald/linux2/probing/probe-storage.c: (vid_log), (main): +--- a/hald/linux2/probing/probe-storage.c ++++ b/hald/linux2/probing/probe-storage.c +@@ -38,6 +38,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -128,7 +129,7 @@ main (int argc, char *argv[]) + DBusError error; + char *bus; + char *drive_type; +- struct volume_id *vid; ++ char *sysfs_path; + dbus_bool_t only_check_for_fs; + + fd = -1; +@@ -147,6 +148,8 @@ main (int argc, char *argv[]) + goto out; + if ((drive_type = getenv ("HAL_PROP_STORAGE_DRIVE_TYPE")) == NULL) + goto out; ++ if ((sysfs_path = getenv ("HAL_PROP_LINUX_SYSFS_PATH")) == NULL) ++ goto out; + + _set_debug (); + +@@ -353,6 +356,11 @@ main (int argc, char *argv[]) + + close (fd); + } else { ++ struct volume_id *vid; ++ GDir *dir; ++ const gchar *partition; ++ const gchar *main_device; ++ size_t main_device_len; + + dbg ("Checking for file system on %s", device_file); + +@@ -367,7 +375,28 @@ main (int argc, char *argv[]) + goto out; + } + dbg ("Returned from open(2)"); +- ++ ++ /* if the kernel has created partitions, we don't look for a filesystem */ ++ main_device = strrchr (sysfs_path, '/'); ++ if (main_device == NULL) ++ goto out; ++ main_device = &main_device[1]; ++ main_device_len = strlen (main_device); ++ dbg ("look for existing partitions for %s", main_device); ++ if ((dir = g_dir_open (sysfs_path, 0, NULL)) == NULL) { ++ dbg ("failed to open sysfs dir"); ++ goto out; ++ } ++ while ((partition = g_dir_read_name (dir)) != NULL) { ++ if (strncmp (main_device, partition, main_device_len) == 0 && ++ isdigit (partition[main_device_len])) { ++ dbg ("partition %s found, skip probing for filesystem", partition); ++ g_dir_close (dir); ++ goto out; ++ } ++ } ++ g_dir_close (dir); ++ + /* probe for file system */ + vid = volume_id_open_fd (fd); + if (vid != NULL) { --- hal-0.5.7.1.orig/debian/patches/14_probe_volume_invalidlabel.patch +++ hal-0.5.7.1/debian/patches/14_probe_volume_invalidlabel.patch @@ -0,0 +1,25 @@ +diff -ruN hal-0.5.7-old/hald/linux2/probing/probe-volume.c hal-0.5.7/hald/linux2/probing/probe-volume.c +--- hal-0.5.7-old/hald/linux2/probing/probe-volume.c 2006-02-22 22:27:52.000000000 +0100 ++++ hal-0.5.7/hald/linux2/probing/probe-volume.c 2006-05-10 18:20:39.000000000 +0200 +@@ -67,6 +67,7 @@ + char *endchar; + char *newstr; + char *s; ++ unsigned fixes = 0; + + if (str == NULL) + return NULL; +@@ -75,6 +76,13 @@ + s = newstr; + while (!g_utf8_validate (s, -1, (const char **) &endchar)) { + *endchar = '_'; ++ ++fixes; ++ } ++ ++ /* If we had to fix more than 20% of the characters, give up */ ++ if (fixes > 0 && g_utf8_strlen (newstr, -1) / fixes < 5) { ++ g_free (newstr); ++ newstr = g_strdup(""); + } + + return newstr; --- hal-0.5.7.1.orig/debian/patches/17-mp3-player-fdi.patch +++ hal-0.5.7.1/debian/patches/17-mp3-player-fdi.patch @@ -0,0 +1,56 @@ +diff -Nur hal/build-tree/hal-0.5.7.1/fdi/information/10freedesktop/10-usb-music-players.fdi hal.new/build-tree/hal-0.5.7.1/fdi/information/10freedesktop/10-usb-music-players.fdi +--- hal-0.5.7.1/fdi/information/10freedesktop/10-usb-music-players.fdi 2006-09-18 12:08:34.000000000 +0200 ++++ hal-0.5.7.1/fdi/information/10freedesktop/10-usb-music-players.fdi 2006-09-18 12:15:49.000000000 +0200 +@@ -853,6 +853,52 @@ + + + ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/x-wav ++ audio/x-wav ++ ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ storage ++ ipod ++ info.udi ++ audio/mpeg ++ audio/aac ++ true ++ ++ ++ ++ ++ ++ ++ portable_audio_player ++ portable_audio_player ++ generic ++ storage ++ info.udi ++ audio/mpeg ++ audio/x-ms-wma ++ audio/mpeg ++ audio/x-ms-wma ++ ++ ++ + + + --- hal-0.5.7.1.orig/debian/patches/01_probe_parttable.patch.disabled +++ hal-0.5.7.1/debian/patches/01_probe_parttable.patch.disabled @@ -0,0 +1,13 @@ +diff -ruN hal-0.5.7-old/volume_id/volume_id.c hal-0.5.7/volume_id/volume_id.c +--- hal-0.5.7-old/volume_id/volume_id.c 2006-02-22 07:30:41.000000000 +0100 ++++ hal-0.5.7/volume_id/volume_id.c 2006-03-08 11:21:01.000000000 +0100 +@@ -165,6 +165,9 @@ + if (volume_id_probe_raid(id, off, size) == 0) + return 0; + ++ if (volume_id_probe_msdos_part_table(id, off) == 0) ++ return 0; ++ + if (volume_id_probe_filesystem(id, off, size) == 0) + return 0; + --- hal-0.5.7.1.orig/debian/patches/zzz_add_hwdb_button.patch +++ hal-0.5.7.1/debian/patches/zzz_add_hwdb_button.patch @@ -0,0 +1,2317 @@ +diff -ruN hal-0.5.7-old/tools/device-manager/DeviceManager.py hal-0.5.7/tools/device-manager/DeviceManager.py +--- hal-0.5.7-old/tools/device-manager/DeviceManager.py 2006-05-22 15:14:16.000000000 +0200 ++++ hal-0.5.7/tools/device-manager/DeviceManager.py 2006-05-22 15:14:16.000000000 +0200 +@@ -2,6 +2,7 @@ + + import LaunchpadIntegration + import sys ++import os + import gobject + import gtk + import dbus +@@ -37,6 +38,10 @@ + self.dont_show_virtual = 1 - self.dont_show_virtual + self.update_device_list() + ++ def on_hwdb_activate(self, w): ++ """ run the hwdb client, no need for a test, its a dependency now """ ++ os.spawnl(os.P_WAIT, "/usr/bin/hwdb-gui") ++ + def __init__(self): + """Init the GUI and connect to the HAL daemon.""" + LibGladeApplication.__init__(self, Const.DATADIR + "/hal-device-manager.glade") +diff -ruN hal-0.5.7-old/tools/device-manager/hal-device-manager.glade hal-0.5.7/tools/device-manager/hal-device-manager.glade +--- hal-0.5.7-old/tools/device-manager/hal-device-manager.glade 2005-11-08 16:47:36.000000000 +0100 ++++ hal-0.5.7/tools/device-manager/hal-device-manager.glade 2006-05-22 15:14:35.000000000 +0200 +@@ -21,6 +21,8 @@ + False + GDK_WINDOW_TYPE_HINT_NORMAL + GDK_GRAVITY_NORTH_WEST ++ True ++ False + True + + +@@ -37,6 +39,8 @@ + + + True ++ GTK_PACK_DIRECTION_LTR ++ GTK_PACK_DIRECTION_LTR + + + +@@ -135,6 +139,9 @@ + False + False + True ++ False ++ False ++ False + + + +@@ -145,1081 +152,1319 @@ + + + +- ++ + True +- True +- True +- True +- GTK_POS_TOP +- False +- False ++ False ++ 0 + + +- +- 12 ++ + True +- 9 +- 2 +- False +- 6 +- 6 +- +- +- +- 84 +- 16 +- True +- <b>Vendor:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 0 +- 1 +- fill +- +- +- +- +- +- +- 84 +- 16 +- True +- <b>Device:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 1 +- 2 +- fill +- +- +- +- +- +- +- 250 +- 16 +- True +- True +- Device Name +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 1 +- 2 +- fill +- +- +- +- +- +- +- 84 +- 16 +- True +- <b>Bus Type:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 4 +- 5 +- fill +- +- +- +- +- +- +- 250 +- 16 +- True +- True +- Status +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 3 +- 4 +- fill +- +- +- +- +- +- +- 250 +- 16 +- True +- True +- Bus Type +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 4 +- 5 +- fill +- +- +- +- +- +- +- 84 +- 16 +- True +- <b>Device Type:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 6 +- 7 +- fill +- +- +- +- +- +- +- 250 +- 16 +- True +- True +- Device Type +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 6 +- 7 +- fill +- +- +- +- +- +- +- 250 +- 96 +- True +- True +- Capabilties this might be a pretty long list so blablabla yada yda dyadhsk hdks jdhsk dks hdks hdks +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0 +- 0 +- 0 +- +- +- 1 +- 2 +- 7 +- 8 +- fill +- +- +- +- +- +- +- 250 +- 16 +- True +- True +- Device Vendor +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 0 +- 1 +- +- +- +- +- +- +- True +- <b>Capabilities:</b> +- False +- True +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0 +- 0 +- 0 +- +- +- 0 +- 1 +- 7 +- 8 +- fill +- fill +- +- +- +- +- +- 84 +- 16 +- True +- <b>Status:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- True +- False +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 3 +- 4 +- fill +- +- +- ++ True ++ True ++ True ++ GTK_POS_TOP ++ False ++ False + + +- ++ ++ 12 + True ++ 9 ++ 2 + False +- 0 ++ 6 ++ 6 + + +- ++ ++ 84 ++ 16 ++ True ++ <b>Vendor:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ False ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 0 ++ 1 ++ fill ++ ++ + +- +- +- 0 +- 2 +- 2 +- 3 +- fill +- fill +- +- +- +- +- +- True +- False +- 0 + + +- ++ ++ 84 ++ 16 ++ True ++ <b>Device:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ False ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 1 ++ 2 ++ fill ++ ++ + +- +- +- 0 +- 2 +- 5 +- 6 +- fill +- fill +- +- +- +- +- False +- True +- +- +- +- +- +- True +- Device +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- tab +- +- + +- +- +- 12 +- True +- 7 +- 2 +- False +- 6 +- 6 ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Device Name ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ fill ++ ++ ++ + +- +- +- 84 +- 16 +- True +- <b>Bandwidth:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- True +- False +- 1 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 1 +- 2 +- fill +- +- +- ++ ++ ++ 84 ++ 16 ++ True ++ <b>Bus Type:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ False ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 4 ++ 5 ++ fill ++ ++ ++ + +- +- +- 108 +- 16 +- True +- <b>Vendor:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- True +- False +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 4 +- 5 +- fill +- +- +- ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Status ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 3 ++ 4 ++ fill ++ ++ ++ + +- +- +- 84 +- 16 +- True +- <b>Product:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- True +- False +- 1 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 5 +- 6 +- fill +- +- +- ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Bus Type ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 4 ++ 5 ++ fill ++ ++ ++ + +- +- +- 84 +- 16 +- True +- <b>Revision:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- True +- False +- 1 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 6 +- 7 +- fill +- +- +- ++ ++ ++ 84 ++ 16 ++ True ++ <b>Device Type:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ False ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 6 ++ 7 ++ fill ++ ++ ++ + +- +- +- 250 +- 16 +- True +- True +- USB Version +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 0 +- 1 +- +- +- ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Device Type ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 6 ++ 7 ++ fill ++ ++ ++ + +- +- +- 250 +- 16 +- True +- True +- USB Bandwidth +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 1 +- 2 +- fill +- +- +- ++ ++ ++ 250 ++ 96 ++ True ++ True ++ Capabilties this might be a pretty long list so blablabla yada yda dyadhsk hdks jdhsk dks hdks hdks ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 7 ++ 8 ++ fill ++ ++ ++ + +- +- +- 250 +- 16 +- True +- True +- Max Power Drain +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 2 +- 3 +- fill +- +- +- ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Device Vendor ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 0 ++ 1 ++ ++ ++ + +- +- +- 250 +- 16 +- True +- True +- Manufacturer ID +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 4 +- 5 +- fill +- +- +- ++ ++ ++ True ++ <b>Capabilities:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 1 ++ 0 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 7 ++ 8 ++ fill ++ fill ++ ++ + +- +- +- 250 +- 16 +- True +- True +- Product ID +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 5 +- 6 +- fill +- +- +- ++ ++ ++ 84 ++ 16 ++ True ++ <b>Status:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ True ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 3 ++ 4 ++ fill ++ ++ ++ + +- +- +- 250 +- 16 +- True +- True +- Product Revision +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 +- +- +- 1 +- 2 +- 6 +- 7 +- fill +- +- +- ++ ++ ++ True ++ False ++ 0 + +- +- +- True +- False +- 0 ++ ++ ++ ++ ++ ++ 0 ++ 2 ++ 2 ++ 3 ++ fill ++ fill ++ ++ + + +- ++ ++ True ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ 0 ++ 2 ++ 5 ++ 6 ++ fill ++ fill ++ + + + +- 0 +- 2 +- 3 +- 4 +- fill +- fill ++ False ++ True + + + + +- ++ + True +- <b>USB Version:</b> ++ Device + False +- True ++ False + GTK_JUSTIFY_LEFT + False + False +- 1 ++ 0.5 + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + +- 0 +- 1 +- 0 +- 1 +- fill +- ++ tab + + + + +- ++ ++ 12 + True +- <b>Power Usage:</b> +- False +- True +- GTK_JUSTIFY_LEFT +- False +- False +- 1 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 2 +- 3 +- fill +- +- +- +- +- +- False +- True +- +- ++ 7 ++ 2 ++ False ++ 6 ++ 6 + +- +- +- True +- USB +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- tab +- +- ++ ++ ++ 84 ++ 16 ++ True ++ <b>Bandwidth:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ True ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 1 ++ 2 ++ fill ++ ++ ++ + +- +- +- 12 +- True +- 5 +- 2 +- False +- 6 +- 6 ++ ++ ++ 108 ++ 16 ++ True ++ <b>Vendor:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ True ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 4 ++ 5 ++ fill ++ ++ ++ + +- +- +- 108 +- 16 +- True +- <b>Vendor:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- True +- False +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 0 +- 1 +- +- +- +- ++ ++ ++ 84 ++ 16 ++ True ++ <b>Product:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ True ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 5 ++ 6 ++ fill ++ ++ ++ + +- +- +- 108 +- 16 +- True +- <b>OEM Product:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- True +- False +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- 0 +- 1 +- 4 +- 5 +- +- +- +- ++ ++ ++ 84 ++ 16 ++ True ++ <b>Revision:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ True ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 6 ++ 7 ++ fill ++ ++ ++ + +- +- +- 108 +- 16 +- True +- <b>OEM Vendor:</b> +- False +- True +- GTK_JUSTIFY_RIGHT +- True +- False +- 0.5 +- 0.5 +- 0 +- 0 ++ ++ ++ 250 ++ 16 ++ True ++ True ++ USB Version ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 0 ++ 1 ++ ++ ++ ++ ++ ++ ++ 250 ++ 16 ++ True ++ True ++ USB Bandwidth ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ fill ++ ++ ++ ++ ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Max Power Drain ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 2 ++ 3 ++ fill ++ ++ ++ ++ ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Manufacturer ID ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 4 ++ 5 ++ fill ++ ++ ++ ++ ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Product ID ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 5 ++ 6 ++ fill ++ ++ ++ ++ ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Product Revision ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 6 ++ 7 ++ fill ++ ++ ++ ++ ++ ++ ++ True ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ 0 ++ 2 ++ 3 ++ 4 ++ fill ++ fill ++ ++ ++ ++ ++ ++ True ++ <b>USB Version:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 0 ++ 1 ++ fill ++ ++ ++ ++ ++ ++ ++ True ++ <b>Power Usage:</b> ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 1 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 2 ++ 3 ++ fill ++ ++ ++ + + +- 0 +- 1 +- 3 +- 4 +- +- ++ False ++ True + + + + +- +- 108 +- 16 ++ + True +- <b>Product:</b> ++ USB + False +- True +- GTK_JUSTIFY_RIGHT +- True ++ False ++ GTK_JUSTIFY_LEFT ++ False + False + 0.5 + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + +- 0 +- 1 +- 1 +- 2 +- +- ++ tab + + + + +- ++ ++ 12 + True ++ 5 ++ 2 + False +- 0 ++ 6 ++ 6 + + +- ++ ++ 108 ++ 16 ++ True ++ <b>Vendor:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ True ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 0 ++ 1 ++ ++ ++ + +- +- +- 0 +- 2 +- 2 +- 3 +- fill +- fill +- +- + +- +- +- 250 +- 16 +- True +- True +- Manufacturer ID +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 ++ ++ ++ 108 ++ 16 ++ True ++ <b>OEM Product:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ True ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 4 ++ 5 ++ ++ ++ ++ ++ ++ ++ ++ 108 ++ 16 ++ True ++ <b>OEM Vendor:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ True ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 3 ++ 4 ++ ++ ++ ++ ++ ++ ++ ++ 108 ++ 16 ++ True ++ <b>Product:</b> ++ False ++ True ++ GTK_JUSTIFY_RIGHT ++ True ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ 1 ++ 1 ++ 2 ++ ++ ++ ++ ++ ++ ++ ++ True ++ False ++ 0 ++ ++ ++ ++ ++ ++ ++ 0 ++ 2 ++ 2 ++ 3 ++ fill ++ fill ++ ++ ++ ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Manufacturer ID ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 0 ++ 1 ++ ++ ++ ++ ++ ++ ++ 250 ++ 16 ++ True ++ True ++ Product ID ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 1 ++ 2 ++ fill ++ ++ ++ ++ ++ ++ ++ 250 ++ 16 ++ True ++ True ++ OEM Manufacturer ID ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 3 ++ 4 ++ fill ++ ++ ++ ++ ++ ++ ++ 250 ++ 16 ++ True ++ True ++ OEM Product ID ++ False ++ True ++ GTK_JUSTIFY_LEFT ++ True ++ True ++ 0 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 1 ++ 2 ++ 4 ++ 5 ++ fill ++ ++ ++ + + +- 1 +- 2 +- 0 +- 1 +- ++ False ++ True + + + + +- +- 250 +- 16 ++ + True +- True +- Product ID ++ PCI + False +- True ++ False + GTK_JUSTIFY_LEFT +- True +- True +- 0 ++ False ++ False ++ 0.5 + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + +- 1 +- 2 +- 1 +- 2 +- fill +- ++ tab + + + + +- +- 250 +- 16 ++ + True + True +- OEM Manufacturer ID +- False +- True +- GTK_JUSTIFY_LEFT +- True +- True +- 0 +- 0.5 +- 0 +- 0 ++ GTK_POLICY_ALWAYS ++ GTK_POLICY_ALWAYS ++ GTK_SHADOW_NONE ++ GTK_CORNER_TOP_LEFT ++ ++ ++ ++ True ++ True ++ True ++ False ++ False ++ True ++ False ++ False ++ False ++ ++ + + +- 1 +- 2 +- 3 +- 4 +- fill +- ++ False ++ True + + + + +- +- 250 +- 16 ++ + True +- True +- OEM Product ID ++ Advanced + False +- True ++ False + GTK_JUSTIFY_LEFT +- True +- True +- 0 ++ False ++ False ++ 0.5 + 0.5 + 0 + 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 + + +- 1 +- 2 +- 4 +- 5 +- fill +- ++ tab + + + + +- False +- True +- +- +- +- +- +- True +- PCI +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- tab ++ 0 ++ True ++ True + + + + +- ++ + True + True +- GTK_POLICY_ALWAYS +- GTK_POLICY_ALWAYS +- GTK_SHADOW_NONE +- GTK_CORNER_TOP_LEFT ++ GTK_RELIEF_NORMAL ++ True ++ + + +- ++ + True +- True +- True +- False +- False +- True ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ 0 ++ ++ ++ ++ True ++ False ++ 2 ++ ++ ++ ++ True ++ /usr/share/hwdb-client/hwdb.png ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ ++ ++ True ++ Ubuntu Device Database ++ True ++ False ++ GTK_JUSTIFY_LEFT ++ False ++ False ++ 0.5 ++ 0.5 ++ 0 ++ 0 ++ PANGO_ELLIPSIZE_NONE ++ -1 ++ False ++ 0 ++ ++ ++ 0 ++ False ++ False ++ ++ ++ ++ + + + + +- False +- True +- +- +- +- +- +- True +- Advanced +- False +- False +- GTK_JUSTIFY_LEFT +- False +- False +- 0.5 +- 0.5 +- 0 +- 0 +- +- +- tab ++ 0 ++ False ++ False + + + --- hal-0.5.7.1.orig/debian/patches/hdm-python2.4.patch +++ hal-0.5.7.1/debian/patches/hdm-python2.4.patch @@ -0,0 +1,9 @@ +diff -ruN hal-0.5.7-old/tools/device-manager/hal-device-manager hal-0.5.7/tools/device-manager/hal-device-manager +--- hal-0.5.7-old/tools/device-manager/hal-device-manager.in 2005-08-26 17:51:51.000000000 +0200 ++++ hal-0.5.7/tools/device-manager/hal-device-manager.in 2005-10-30 18:56:39.000000000 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!/usr/bin/python2.4 + + """This is the main executable for DeviceManager. GTK+/Glade code is based + on simplepy from Shannon -jj Behrens """ --- hal-0.5.7.1.orig/debian/patches/08_privileges-addons.patch +++ hal-0.5.7.1/debian/patches/08_privileges-addons.patch @@ -0,0 +1,12 @@ +diff -ruN hal-0.5.6-old/hald/linux2/addons/addon-storage.c hal-0.5.6/hald/linux2/addons/addon-storage.c +--- hal-0.5.6-old/hald/linux2/addons/addon-storage.c 2006-02-21 15:44:15.000000000 +0100 ++++ hal-0.5.6/hald/linux2/addons/addon-storage.c 2006-02-21 15:44:15.000000000 +0100 +@@ -162,6 +162,8 @@ + char *support_media_changed_str; + int support_media_changed; + ++ drop_privileges (1); ++ + if ((udi = getenv ("UDI")) == NULL) + goto out; + if ((device_file = getenv ("HAL_PROP_BLOCK_DEVICE")) == NULL) --- hal-0.5.7.1.orig/debian/patches/08_probe_serial.patch +++ hal-0.5.7.1/debian/patches/08_probe_serial.patch @@ -0,0 +1,24 @@ +diff -ruN hal-0.5.7-old/hald/linux2/classdev.c hal-0.5.7/hald/linux2/classdev.c +--- hal-0.5.7-old/hald/linux2/classdev.c 2006-01-28 23:51:18.000000000 +0100 ++++ hal-0.5.7/hald/linux2/classdev.c 2006-05-01 22:42:45.000000000 +0200 +@@ -1,5 +1,5 @@ + /*************************************************************************** +- * CVSID: $Id: classdev.c,v 1.42 2006/01/28 22:51:18 david Exp $ ++ * CVSID: $Id: classdev.c,v 1.43 2006/03/03 19:19:53 dkukawka Exp $ + * + * classdev.c : Handling of functional kernel devices + * +@@ -927,7 +927,12 @@ + static const gchar * + serial_get_prober (HalDevice *d) + { +- return "hald-probe-serial"; ++ /* FIXME TODO: check if there is an other way, to call the porber only ++ on ttyS* devices, than check the name of the device file */ ++ if (!strncmp(hal_device_property_get_string (d, "linux.device_file"), "/dev/ttyS", 9)) ++ return "hald-probe-serial"; ++ else ++ return NULL; + } + + static gboolean --- hal-0.5.7.1.orig/debian/patches/05_pmu_nohibernate.patch +++ hal-0.5.7.1/debian/patches/05_pmu_nohibernate.patch @@ -0,0 +1,28 @@ +diff -ruN hal-0.5.7-old/hald/linux2/osspec.c hal-0.5.7/hald/linux2/osspec.c +--- hal-0.5.7-old/hald/linux2/osspec.c 2006-02-13 17:42:32.000000000 +0100 ++++ hal-0.5.7/hald/linux2/osspec.c 2006-03-01 11:56:20.000000000 +0100 +@@ -447,6 +447,7 @@ + unsigned int len; + char *poweroptions; + FILE *fp; ++ const char* pmtype = NULL; + + can_suspend = FALSE; + can_hibernate = FALSE; +@@ -471,6 +472,16 @@ + can_hibernate = TRUE; + free (poweroptions); + ++ pmtype = hal_device_property_get_string(d,"power_management.type"); ++ if (pmtype && !strcmp(pmtype, "pmu")) { ++ /* Although /sys/power/state exists on pmu based machines, using it just ++ * crashes mine. Suspending works via the pmu though. So overriding what we ++ * just saw... ++ * Should be removed as soon as /sys/power works on PMU */ ++ can_hibernate = FALSE; ++ can_suspend = TRUE; ++ } ++ + /* check for the presence of suspend2 */ + if (access ("/proc/software_suspend", F_OK) == 0) + can_hibernate = TRUE; --- hal-0.5.7.1.orig/debian/10-storage-policy.fdi +++ hal-0.5.7.1/debian/10-storage-policy.fdi @@ -0,0 +1,219 @@ + + + + + + + + true + + + + + + + + true + + + true + + + true + + + true + + + true + + + true + + + + + + true + + + + + + true + true + + + + true + + + true + + + + + + + auto + cdrom + + cdrecorder + + + cdrecorder + + + dvdrecorder + + + dvdrecorder + + + dvdrecorder + + + dvdrecorder + + + dvdrecorder + + + + + + auto + floppy + + + + + auto + zip + + + + + auto + jaz + + + + + + + + + @block.storage_device:storage.policy.desired_mount_point + + + + true + volume.fstype + + + @block.storage_device:storage.bus + disk + + + + zip + + + + + + + + + volume.label + + + + + + + + false + + + + + + ipod + + + + + psp + + + + + + false + + + true + + + + true + + + + true + + + + true + + + + true + + + + true + + + + true + + + + true + + + + + + + + + + + + + false + + + + + + + + + true + + + true + + + + --- hal-0.5.7.1.orig/debian/copyright +++ hal-0.5.7.1/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.7.1.orig/debian/hal.init.dbus +++ hal-0.5.7.1/debian/hal.init.dbus @@ -0,0 +1,86 @@ +#! /bin/sh +# +# hal Start the Daemon that stores device informations +# for the Hardware abstraction layer +# +# Written by Martin Waitz based on skeleton code +# written by Miquel van Smoorenburg . +# Modified for Debian +# by Ian Murdock . +# + +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() { + if [ ! -d $PIDDIR ]; then + mkdir -p $PIDDIR + chown $DAEMONUSER:$DAEMONUSER $PIDDIR + fi + log_daemon_msg "Starting $DESC" "$NAME" + start-stop-daemon --start --pidfile $PIDFILE \ + --exec $DAEMON -- $DAEMON_OPTS + log_end_msg $? +} + +do_stop() { + log_daemon_msg "Stopping $DESC" "$NAME" + start-stop-daemon --stop --oknodo --quiet --pidfile $PIDFILE \ + --exec $DAEMON + log_end_msg $? +} + +case "$1" in + start) + do_start + ;; + stop) + do_stop + ;; + #reload) + # + # If the daemon can reload its config files on the fly + # for example by sending it SIGHUP, do it here. + # + # If the daemon responds to changes in its config file + # directly anyway, make this a do-nothing entry. + # + # echo "Reloading $DESC configuration files." + # start-stop-daemon --stop --signal 1 --quiet --pidfile \ + # /var/run/$NAME.pid --exec $DAEMON + #;; + restart|force-reload) + # + # If the "reload" option is implemented, move the "force-reload" + # option to the "reload" entry above. If not, "force-reload" is + # just the same as "restart". + # + do_stop + sleep 5 + do_start + ;; + *) + N=/etc/init.d/$NAME + # echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2 + log_success_msg "Usage: $N {start|stop|restart|force-reload}" >&2 + exit 1 + ;; +esac + +exit 0 --- hal-0.5.7.1.orig/debian/preferences.fdi +++ hal-0.5.7.1/debian/preferences.fdi @@ -0,0 +1,59 @@ + + + + + + + + + + + + --- hal-0.5.7.1.orig/debian/hal-device-manager.manpages +++ hal-0.5.7.1/debian/hal-device-manager.manpages @@ -0,0 +1 @@ +build-tree/*/debian/hal-device-manager.1 --- hal-0.5.7.1.orig/debian/hal.udev.rules +++ hal-0.5.7.1/debian/hal.udev.rules @@ -0,0 +1,5 @@ +# Have udev pass data over a socket to hal +RUN+="socket:/org/freedesktop/hal/udev_event" + +# unmount block devices when they are removed +SUBSYSTEM=="block", ACTION=="remove", RUN+="/usr/lib/hal/hal-unmount.sh" --- hal-0.5.7.1.orig/debian/libhal-storage-dev.install +++ hal-0.5.7.1/debian/libhal-storage-dev.install @@ -0,0 +1,5 @@ +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.la +debian/tmp/usr/lib/libhal-storage.a --- hal-0.5.7.1.orig/debian/hal.install +++ hal-0.5.7.1/debian/hal.install @@ -0,0 +1,15 @@ +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/sbin/ +debian/tmp/usr/lib/hal/ +debian/tmp/usr/share/hal/fdi +debian/tmp/usr/share/hal/scripts/hal-system-power-* +debian/tmp/usr/share/hal/scripts/hal-system-lcd-* +debian/tmp/usr/share/hal/scripts/hal-system-storage-* +debian/preferences.fdi etc/hal/fdi/policy +debian/10-storage-policy.fdi /usr/share/hal/fdi/policy/10osvendor