Hi,
please unblock hal_0.5.11-3
The changelog between 0.5.11-2 and 0.5.11-3 is:
hal (0.5.11-3) unstable; urgency=low
[ Michael Biebl ]
* Remove our custom udev rules file and use the one provided by upstream.
- debian/hal.udev.rules: Remove, no longer needed.
- debian/rules: Remove the installation of the udev rules file.
- debian/hal.links: No longer create the symlink
/etc/udev/rules.d/z99_hal.rules. The upstream udev rules file is now
directly installed as /etc/udev/rules.d/90-hal.rules.
- debian/hal.preinst: Remove the conffile /etc/udev/hal.rules and the
z99_hal.rules symlink on upgrades.
* debian/control
- Bump Standards-Version to 3.8.0. No further changes.
- Depend on lsb-base >= 3.2-14, providing status_of_proc().
* debian/patches/01_hal_debian_dbuspolicy.patch
- Add a "at_console" policy in addition to the group based policies.
* debian/hal.init
- Add "status" action. (Closes: #492625)
Thanks to Tim Bielawa for the patch.
[ Loic Minier ]
* List lpia arch in libsmbios bdeps and deps.
-- Michael Biebl <biebl@debian.org> Sun, 17 Aug 2008 20:06:13 +0200
The complete debdiff is attached.
The important change is in debian/patches/01_hal_debian_dbuspolicy.patch.
hal is the last package which was missing the at_console policy.
Together with consolekit_0.2.10-2, which was accepted into lenny just
today, this allows for an alternative authentication scheme to our group
based policies.
The other changes include the addition of a status action to the init
script (the required lsb-base version is already in lenny)
and and update to the udev rules file.
The latest udev package, which is in lenny, has reorganized its udev
rules files and the hal udev rules file was updated accordingly.
Thanks for considering,
Michael
--
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?
diff -u hal-0.5.11/debian/changelog hal-0.5.11/debian/changelog
--- hal-0.5.11/debian/changelog
+++ hal-0.5.11/debian/changelog
@@ -1,3 +1,28 @@
+hal (0.5.11-3) unstable; urgency=low
+
+ [ Michael Biebl ]
+ * Remove our custom udev rules file and use the one provided by upstream.
+ - debian/hal.udev.rules: Remove, no longer needed.
+ - debian/rules: Remove the installation of the udev rules file.
+ - debian/hal.links: No longer create the symlink
+ /etc/udev/rules.d/z99_hal.rules. The upstream udev rules file is now
+ directly installed as /etc/udev/rules.d/90-hal.rules.
+ - debian/hal.preinst: Remove the conffile /etc/udev/hal.rules and the
+ z99_hal.rules symlink on upgrades.
+ * debian/control
+ - Bump Standards-Version to 3.8.0. No further changes.
+ - Depend on lsb-base >= 3.2-14, providing status_of_proc().
+ * debian/patches/01_hal_debian_dbuspolicy.patch
+ - Add a "at_console" policy in addition to the group based policies.
+ * debian/hal.init
+ - Add "status" action. (Closes: #492625)
+ Thanks to Tim Bielawa for the patch.
+
+ [ Loic Minier ]
+ * List lpia arch in libsmbios bdeps and deps.
+
+ -- Michael Biebl <biebl@debian.org> Sun, 17 Aug 2008 20:06:13 +0200
+
hal (0.5.11-2) unstable; urgency=low
* debian/patches/01_hal_debian_dbuspolicy.patch
diff -u hal-0.5.11/debian/hal.preinst hal-0.5.11/debian/hal.preinst
--- hal-0.5.11/debian/hal.preinst
+++ hal-0.5.11/debian/hal.preinst
@@ -32,9 +32,6 @@
if dpkg --compare-versions "$2" le "0.5.6-4"; then
rm_conffile "/etc/hal/fdi/preferences.fdi"
fi
- if dpkg --compare-versions "$2" le "0.5.7-2"; then
- rm_conffile "/etc/udev/rules.d/90-hal.rules"
- fi
if dpkg --compare-versions "$2" le "0.5.7.1-1"; then
deluser --quiet --system hal > /dev/null || true
fi
@@ -44,6 +41,10 @@
fi
rm_conffile "/etc/dbus-1/event.d/20hal"
fi
+ if dpkg --compare-versions "$2" lt "0.5.11-3"; then
+ rm_conffile "/etc/udev/hal.rules"
+ rm -f /etc/udev/rules.d/z99_hal.rules
+ fi
esac
#DEBHELPER#
diff -u hal-0.5.11/debian/hal.links hal-0.5.11/debian/hal.links
--- hal-0.5.11/debian/hal.links
+++ hal-0.5.11/debian/hal.links
@@ -1,2 +1 @@
-/etc/udev/hal.rules etc/udev/rules.d/z99_hal.rules
/usr/sbin/umount.hal sbin/umount.hal
diff -u hal-0.5.11/debian/copyright hal-0.5.11/debian/copyright
--- hal-0.5.11/debian/copyright
+++ hal-0.5.11/debian/copyright
@@ -30,9 +30,11 @@
a) to reproduce the Original Work in copies;
-b) to prepare derivative works ("Derivative Works") based upon the Original Work;
+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;
+c) to distribute copies of the Original Work and Derivative Works to
+ the public;
d) to perform the Original Work publicly; and
@@ -180,9 +182,9 @@
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:
+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
reverted:
--- hal-0.5.11/debian/hal.udev.rules
+++ hal-0.5.11.orig/debian/hal.udev.rules
@@ -1,2 +0,0 @@
-# Have udev pass data over a socket to hal
-RUN+="socket:/org/freedesktop/hal/udev_event"
diff -u hal-0.5.11/debian/hal.init hal-0.5.11/debian/hal.init
--- hal-0.5.11/debian/hal.init
+++ hal-0.5.11/debian/hal.init
@@ -82,8 +82,11 @@
do_start
log_end_msg $?
;;
+ status)
+ status_of_proc -p $PIDFILE $DAEMON $NAME && exit 0 || exit $?
+ ;;
*)
- log_success_msg "Usage: $0 {start|stop|restart|force-reload}" >&2
+ log_success_msg "Usage: $0 {start|stop|restart|force-reload|status}" >&2
exit 1
;;
esac
diff -u hal-0.5.11/debian/rules hal-0.5.11/debian/rules
--- hal-0.5.11/debian/rules
+++ hal-0.5.11/debian/rules
@@ -23,13 +23,6 @@
DEB_DH_INSTALLINIT_ARGS := -- start 24 2 3 4 5 . stop 16 0 1 6 .
-common-install-impl::
- # Remove hal's default udev rules files.. We ship our own
- rm -rf $(DEB_DESTDIR)/etc/udev
-
- install -m 644 -D debian/hal.udev.rules \
- $(DEB_DESTDIR)/etc/udev/hal.rules
-
install/hal::
# Remove executable bit as this is nothing that can be executed
chmod -x $(DEB_DESTDIR)/usr/lib/hal/scripts/hal-functions
diff -u hal-0.5.11/debian/control hal-0.5.11/debian/control
--- hal-0.5.11/debian/control
+++ hal-0.5.11/debian/control
@@ -3,16 +3,16 @@
Priority: optional
Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers@lists.alioth.debian.org>
Uploaders: Sjoerd Simons <sjoerd@debian.org>, Sebastian Dröge <slomo@debian.org>, Michael Biebl <biebl@debian.org>
-Build-Depends: debhelper (>= 5.0.37.2), cdbs, autotools-dev, libdbus-glib-1-dev (>= 0.61), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, doxygen, intltool (>= 0.22), libusb-dev [!hurd-i386], libvolume-id-dev, xmlto, libxml2-utils, gtk-doc-tools, libsmbios-dev [i386 amd64], gperf
-Standards-Version: 3.7.3
+Build-Depends: debhelper (>= 5.0.37.2), cdbs, autotools-dev, libdbus-glib-1-dev (>= 0.61), libglib2.0-dev, libsysfs-dev, libexpat1-dev, libpopt-dev, pkg-config, pciutils, doxygen, intltool (>= 0.22), libusb-dev [!hurd-i386], libvolume-id-dev, xmlto, libxml2-utils, gtk-doc-tools, libsmbios-dev [amd64 i386 lpia], gperf
+Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-utopia/packages/unstable/hal
Vcs-Browser: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal
Homepage: http://hal.freedesktop.org/
Package: hal
Architecture: any
-Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.065), dbus (>= 0.61), lsb-base, hal-info (>= 20070402), pm-utils, mount (>= 2.13)
-Recommends: eject, libsmbios-bin [i386 amd64]
+Depends: ${shlibs:Depends}, adduser, pciutils, usbutils, udev (>= 0.065), dbus (>= 0.61), lsb-base (>= 3.2-14), hal-info (>= 20070402), pm-utils, mount (>= 2.13)
+Recommends: eject, libsmbios-bin [amd64 i386 lpia]
Suggests: gnome-device-manager
Description: Hardware Abstraction Layer
HAL provides an abstract view on hardware.
diff -u hal-0.5.11/debian/patches/01_hal_debian_dbuspolicy.patch hal-0.5.11/debian/patches/01_hal_debian_dbuspolicy.patch
--- hal-0.5.11/debian/patches/01_hal_debian_dbuspolicy.patch
+++ hal-0.5.11/debian/patches/01_hal_debian_dbuspolicy.patch
@@ -1,8 +1,8 @@
diff --git a/hal.conf.in b/hal.conf.in
-index ef97b8f..3646deb 100644
+index ef97b8f..7ed6cf7 100644
--- a/hal.conf.in
+++ b/hal.conf.in
-@@ -40,6 +40,26 @@
+@@ -40,6 +40,35 @@
<!-- Default policy for the exported interfaces; if PolicyKit is not used
for access control you will need to modify this -->
<policy context="default">
@@ -13,6 +13,15 @@
+ <deny send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
+ </policy>
+
++ <!-- This will not work if consolekit is not enabled -->
++ <policy at_console="true">
++ <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
++ <allow send_interface="org.freedesktop.Hal.Device.VideoAdapterPM"/>
++ <allow send_interface="org.freedesktop.Hal.Device.LaptopPanel"/>
++ <allow send_interface="org.freedesktop.Hal.Device.Volume"/>
++ <allow send_interface="org.freedesktop.Hal.Device.Volume.Crypto"/>
++ </policy>
++
+ <!-- Debian groups policies -->
+ <policy group="powerdev">
+ <allow send_interface="org.freedesktop.Hal.Device.SystemPowerManagement"/>
Attachment:
signature.asc
Description: OpenPGP digital signature