[Pkg-utopia-commits] r936 - packages/unstable/hal/debian

[Sjoerd Simons]

Author: sjoerd
Date: 2006-08-14 21:41:45 +0000 (Mon, 14 Aug 2006)
New Revision: 936

Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/hal.init.dbus
   packages/unstable/hal/debian/hal.links
   packages/unstable/hal/debian/hal.postinst
   packages/unstable/hal/debian/hal.postrm
   packages/unstable/hal/debian/rules
Log:
* New upstream release
* debian/hal.postinst,debian/hal.postrm,debian/rules: Rename the hal daemon
  user to haldaemon (was hal)
* debian/hal.postinst: Created the plugdev system group if it doesn't exist
* debian/hal.links: Change the udev rules.d link from 050_hal-plugdev.rules
  to z99_hal.rules to ensure hal gets its data after all the udev magic.

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-08-14 20:47:42 UTC (rev 935)
+++ packages/unstable/hal/debian/changelog	2006-08-14 21:41:45 UTC (rev 936)
@@ -1,5 +1,14 @@
-hal (0.5.7-3) unstable; urgency=low
+hal (0.5.7.1-1) unstable; urgency=low
 
+  [ Sjoerd Simons ]
+  * New upstream release
+  * debian/hal.postinst,debian/hal.postrm,debian/rules: Rename the hal daemon
+    user to haldaemon (was hal)
+  * debian/hal.postinst: Created the plugdev system group if it doesn't exist
+  * debian/hal.links: Change the udev rules.d link from 050_hal-plugdev.rules
+    to z99_hal.rules to ensure hal gets its data after all the udev magic.
+
+  [ Sebastian Dröge  ]
   * debian/pycompat,
     debian/control,
     debian/rules:
@@ -8,7 +17,7 @@
     + Bump Standards-Version to 3.7.2
     + Add myself to Uploaders
 
- -- Sebastian Dröge <slomo at ubuntu.com>  Mon, 10 Jul 2006 23:03:53 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon, 14 Aug 2006 23:41:19 +0200
 
 hal (0.5.7-2) unstable; urgency=low
 

Modified: packages/unstable/hal/debian/hal.init.dbus
===================================================================
--- packages/unstable/hal/debian/hal.init.dbus	2006-08-14 20:47:42 UTC (rev 935)
+++ packages/unstable/hal/debian/hal.init.dbus	2006-08-14 21:41:45 UTC (rev 936)
@@ -14,7 +14,7 @@
 PIDDIR=/var/run/hal
 PIDFILE=$PIDDIR/hald.pid
 NAME=hald
-DAEMONUSER=hal
+DAEMONUSER=haldaemon
 DESC="Hardware abstraction layer"
 
 . /lib/lsb/init-functions

Modified: packages/unstable/hal/debian/hal.links
===================================================================
--- packages/unstable/hal/debian/hal.links	2006-08-14 20:47:42 UTC (rev 935)
+++ packages/unstable/hal/debian/hal.links	2006-08-14 21:41:45 UTC (rev 936)
@@ -1 +1 @@
-/etc/udev/hal.rules etc/udev/rules.d/050_hal-plugdev.rules
+/etc/udev/hal.rules etc/udev/rules.d/z99_hal.rules

Modified: packages/unstable/hal/debian/hal.postinst
===================================================================
--- packages/unstable/hal/debian/hal.postinst	2006-08-14 20:47:42 UTC (rev 935)
+++ packages/unstable/hal/debian/hal.postinst	2006-08-14 21:41:45 UTC (rev 936)
@@ -25,16 +25,21 @@
 
 case "$1" in
   configure)
-    if ! getent passwd hal >/dev/null; then 
+    if ! getent passwd haldaemon >/dev/null; then 
       adduser --disabled-password --quiet --system --home /var/run/hal \
-        --gecos "Hardware abstraction layer" --group hal
+        --gecos "Hardware abstraction layer" --group haldaemon
     fi
     if ! getent group powerdev > /dev/null; then
        addgroup --quiet --system powerdev || true
     fi
 
+    # Add the plugdev group
+    if ! getent group plugdev > /dev/null; then
+       addgroup --quiet --system plugdev || true
+    fi
+
     # be sure the run dir is owned by the hal user
-    chown hal:hal /var/run/hal 2>/dev/null || true
+    chown haldaemon:haldaemon /var/run/hal 2>/dev/null || true
 
     if [ -f /etc/init.d/hal ]; then
       # handle upgrades

Modified: packages/unstable/hal/debian/hal.postrm
===================================================================
--- packages/unstable/hal/debian/hal.postrm	2006-08-14 20:47:42 UTC (rev 935)
+++ packages/unstable/hal/debian/hal.postrm	2006-08-14 21:41:45 UTC (rev 936)
@@ -10,8 +10,8 @@
 #DEBHELPER#
 
 if [ "$1" = "purge" ] ; then
-        deluser --quiet --system hal > /dev/null || true
-        delgroup --quiet --system hal > /dev/null || true
+        deluser --quiet --system haldaemon > /dev/null || true
+        delgroup --quiet --system haldaemon > /dev/null || true
 fi
 
 exit 0

Modified: packages/unstable/hal/debian/rules
===================================================================
--- packages/unstable/hal/debian/rules	2006-08-14 20:47:42 UTC (rev 935)
+++ packages/unstable/hal/debian/rules	2006-08-14 21:41:45 UTC (rev 936)
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_TAR_SRCDIR=hal-0.5.7
+DEB_TAR_SRCDIR=hal-0.5.7.1
 
 include /usr/share/cdbs/1/rules/tarball.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
@@ -9,9 +9,7 @@
 include /usr/share/cdbs/1/rules/utils.mk
 
 DEB_PYTHON_COMPILE_VERSION = 2.4
-DEB_CONFIGURE_EXTRA_FLAGS := --with-hal-user=hal  \
-                             --with-hal-group=hal \
-                             --enable-hotplug-map  \
+DEB_CONFIGURE_EXTRA_FLAGS := --enable-hotplug-map  \
                              --with-pid-file=/var/run/hal/hald.pid \
                              --enable-pcmcia-support \
                              --with-hwdata=/usr/share/misc