[Pkg-utopia-commits] r2421 - in /packages/experimental/hal/debian: changelog control hal.install hal.manpages hal.postinst patches/01_hal_debian_dbuspolicy.patch patches/20_no_policy_validate.patch patches/55_nonpolkit-mount-policy.patch rules
biebl at users.alioth.debian.org
biebl at users.alioth.debian.org
Wed Sep 3 12:42:47 UTC 2008
Author: biebl
Date: Wed Sep 3 12:42:46 2008
New Revision: 2421
URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2421
Log:
* Enable the ConsoleKit/PolicyKit support in hal. Upload to experimental to
give this feature some wider testing.
* debian/control
- Add a Build-Depends on libpolkit-dev (>= 0.5).
- Add a Depends on policykit and consolekit to the hal package.
* debian/rules
- Add --enable-console-kit and --enable-policy-kit to
DEB_CONFIGURE_EXTRA_FLAGS.
- Enable acl management by passing --enable-acl-management to
DEB_CONFIGURE_EXTRA_FLAGS.
* debian/hal.install
- Install the policy files in /usr/share/PolicyKit/.
* debian/hal.manpages
- Install the man page for hal-is-caller-privileged.
* debian/patches/01_hal_debian_dbuspolicy.patch
- Removed. Patch is obsolete as PolicyKit is used for access control.
* debian/patches/55_nonpolkit-mount-policy.patch
- Removed. Mounting storage devices is controlled by PolicyKit now.
* debian/patches/20_no_policy_validate.patch
- Don't fail during configure if polkit-policy-file-validate is not found.
This avoids an unnecessary build dependency on policykit.
Added:
packages/experimental/hal/debian/patches/20_no_policy_validate.patch
Removed:
packages/experimental/hal/debian/patches/01_hal_debian_dbuspolicy.patch
packages/experimental/hal/debian/patches/55_nonpolkit-mount-policy.patch
Modified:
packages/experimental/hal/debian/changelog
packages/experimental/hal/debian/control
packages/experimental/hal/debian/hal.install
packages/experimental/hal/debian/hal.manpages
packages/experimental/hal/debian/hal.postinst
packages/experimental/hal/debian/rules
Modified: packages/experimental/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/changelog?rev=2421&op=diff
==============================================================================
--- packages/experimental/hal/debian/changelog (original)
+++ packages/experimental/hal/debian/changelog Wed Sep 3 12:42:46 2008
@@ -1,3 +1,29 @@
+hal (0.5.11-4~exp1) experimental; urgency=low
+
+ * Enable the ConsoleKit/PolicyKit support in hal. Upload to experimental to
+ give this feature some wider testing.
+ * debian/control
+ - Add a Build-Depends on libpolkit-dev (>= 0.5).
+ - Add a Depends on policykit and consolekit to the hal package.
+ * debian/rules
+ - Add --enable-console-kit and --enable-policy-kit to
+ DEB_CONFIGURE_EXTRA_FLAGS.
+ - Enable acl management by passing --enable-acl-management to
+ DEB_CONFIGURE_EXTRA_FLAGS.
+ * debian/hal.install
+ - Install the policy files in /usr/share/PolicyKit/.
+ * debian/hal.manpages
+ - Install the man page for hal-is-caller-privileged.
+ * debian/patches/01_hal_debian_dbuspolicy.patch
+ - Removed. Patch is obsolete as PolicyKit is used for access control.
+ * debian/patches/55_nonpolkit-mount-policy.patch
+ - Removed. Mounting storage devices is controlled by PolicyKit now.
+ * debian/patches/20_no_policy_validate.patch
+ - Don't fail during configure if polkit-policy-file-validate is not found.
+ This avoids an unnecessary build dependency on policykit.
+
+ -- Michael Biebl <biebl at debian.org> Wed, 03 Sep 2008 14:32:28 +0200
+
hal (0.5.11-3) unstable; urgency=low
[ Michael Biebl ]
Modified: packages/experimental/hal/debian/control
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/control?rev=2421&op=diff
==============================================================================
--- packages/experimental/hal/debian/control (original)
+++ packages/experimental/hal/debian/control Wed Sep 3 12:42:46 2008
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: Utopia Maintenance Team <pkg-utopia-maintainers at lists.alioth.debian.org>
Uploaders: Sjoerd Simons <sjoerd at debian.org>, Sebastian Dröge <slomo at debian.org>, Michael Biebl <biebl at 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 [amd64 i386 lpia], gperf
+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, libpolkit-dev (>= 0.5)
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
@@ -11,7 +11,7 @@
Package: hal
Architecture: any
-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)
+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), policykit, consolekit
Recommends: eject, libsmbios-bin [amd64 i386 lpia]
Suggests: gnome-device-manager
Description: Hardware Abstraction Layer
Modified: packages/experimental/hal/debian/hal.install
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/hal.install?rev=2421&op=diff
==============================================================================
--- packages/experimental/hal/debian/hal.install (original)
+++ packages/experimental/hal/debian/hal.install Wed Sep 3 12:42:46 2008
@@ -3,6 +3,7 @@
debian/tmp/usr/sbin/
debian/tmp/sbin/umount.hal usr/sbin
debian/tmp/usr/lib/hal/
-debian/tmp/usr/share/hal/fdi
+debian/tmp/usr/share/hal/fdi/
+debian/tmp/usr/share/PolicyKit/
debian/preferences.fdi etc/hal/fdi/policy
debian/debian-storage-policy-ignore-fixed-crypto-drives.fdi usr/share/hal/fdi/policy/10osvendor
Modified: packages/experimental/hal/debian/hal.manpages
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/hal.manpages?rev=2421&op=diff
==============================================================================
--- packages/experimental/hal/debian/hal.manpages (original)
+++ packages/experimental/hal/debian/hal.manpages Wed Sep 3 12:42:46 2008
@@ -4,6 +4,7 @@
debian/tmp/usr/share/man/man1/hal-find-by-property.1
debian/tmp/usr/share/man/man1/hal-get-property.1
debian/tmp/usr/share/man/man1/hal-is-caller-locked-out.1
+debian/tmp/usr/share/man/man1/hal-is-caller-privileged.1
debian/tmp/usr/share/man/man1/hal-lock.1
debian/tmp/usr/share/man/man1/hal-set-property.1
debian/tmp/usr/share/man/man1/lshal.1
Modified: packages/experimental/hal/debian/hal.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/hal.postinst?rev=2421&op=diff
==============================================================================
--- packages/experimental/hal/debian/hal.postinst (original)
+++ packages/experimental/hal/debian/hal.postinst Wed Sep 3 12:42:46 2008
@@ -42,6 +42,10 @@
# be sure the run dir is owned by the hal user
chown haldaemon:haldaemon /var/run/hal
+ if [ -e /var/run/dbus/system_bus_socket ]; then
+ polkit-auth --user haldaemon --grant org.freedesktop.policykit.read > /dev/null 2>&1 || true
+ fi
+
if [ -x /etc/init.d/dbus ]; then
invoke-rc.d dbus force-reload || true
fi
Added: packages/experimental/hal/debian/patches/20_no_policy_validate.patch
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/patches/20_no_policy_validate.patch?rev=2421&op=file
==============================================================================
--- packages/experimental/hal/debian/patches/20_no_policy_validate.patch (added)
+++ packages/experimental/hal/debian/patches/20_no_policy_validate.patch Wed Sep 3 12:42:46 2008
@@ -1,0 +1,29 @@
+diff --git a/configure b/configure
+index ba74ffe..31c8ad2 100755
+--- a/configure
++++ b/configure
+@@ -23258,9 +23258,8 @@ fi
+
+
+ if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
+- { { echo "$as_me:$LINENO: error: polkit-policy-file-validate not found" >&5
+-echo "$as_me: error: polkit-policy-file-validate not found" >&2;}
+- { (exit 1); exit 1; }; }
++ { echo "$as_me:$LINENO: WARNING: polkit-policy-file-validate not found" >&5
++echo "$as_me: WARNING: polkit-policy-file-validate not found" >&2;}
+ fi
+ fi
+
+diff --git a/configure.in b/configure.in
+index d2b273f..d1bf03c 100644
+--- a/configure.in
++++ b/configure.in
+@@ -527,7 +527,7 @@ if test "x$enable_policy_kit" != "xno"; then
+ AC_CHECK_PROG([POLKIT_POLICY_FILE_VALIDATE],
+ [polkit-policy-file-validate], [polkit-policy-file-validate])
+ if test -z "$POLKIT_POLICY_FILE_VALIDATE"; then
+- AC_MSG_ERROR([polkit-policy-file-validate not found])
++ AC_MSG_WARN([polkit-policy-file-validate not found])
+ fi
+ fi
+
Modified: packages/experimental/hal/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/rules?rev=2421&op=diff
==============================================================================
--- packages/experimental/hal/debian/rules (original)
+++ packages/experimental/hal/debian/rules Wed Sep 3 12:42:46 2008
@@ -15,8 +15,9 @@
--with-hwdata=/usr/share/misc \
--without-macbook \
--without-macbookpro \
- --disable-policy-kit \
- --disable-console-kit \
+ --enable-policy-kit \
+ --enable-console-kit \
+ --enable-acl-management \
--enable-umount-helper \
--enable-docbook-docs \
--docdir=/usr/share/doc/hal-doc
More information about the Pkg-utopia-commits
mailing list