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

[Sjoerd Simons]

Author: sjoerd
Date: 2006-09-04 21:14:58 +0000 (Mon, 04 Sep 2006)
New Revision: 990

Modified:
   packages/unstable/hal/debian/changelog
   packages/unstable/hal/debian/hal.dirs
   packages/unstable/hal/debian/hal.postinst
   packages/unstable/hal/debian/hal.postrm
   packages/unstable/hal/debian/hal.preinst
Log:
  detecting scsi cdrom drives as partitions (From upstream git)
* debian/hal.dirs: Remove /var/run/hal from hal.dirs. Let the init scripts
  takes care of its creation.  (Closes: #385270)
* debian/hal.postinst: Don't create a homedir for hal. 
* debian/hal.preinst: Remove the old hal user. As deluser --system only
  removes system users this should be safe.
* debian/hal.postrm: Don't delgroup the daemon user on purge, deluser
  already takes care of that. 
* debian/hal.postrm: Remove the /var/run/hal dir on purge

Modified: packages/unstable/hal/debian/changelog
===================================================================
--- packages/unstable/hal/debian/changelog	2006-09-04 19:26:05 UTC (rev 989)
+++ packages/unstable/hal/debian/changelog	2006-09-04 21:14:58 UTC (rev 990)
@@ -2,15 +2,23 @@
 
   * debian/patches/22_recognize_partitions.patch
     - Added. More robust recognition that a block device is a partition. Fixes
-    detecting scsi cdrom drives as partitions (From upstream git) 
+    detecting scsi cdrom drives as partitions (From upstream git)
     (Closes: #383792)
   * debian/patches/23_addon_acpi.patch
     - Added. Don't use the kernel acpi event interface if acpid is installed.
     (Closes: #380520, #352512)
   * debian/README.Debian: Update documentations about the configuration of the
     callouts. Also mention how hal's acpi addon interacts with acpid.
+  * debian/hal.dirs: Remove /var/run/hal from hal.dirs. Let the init scripts
+    takes care of its creation.  (Closes: #385270)
+  * debian/hal.postinst: Don't create a homedir for hal. 
+  * debian/hal.preinst: Remove the old hal user. As deluser --system only
+    removes system users this should be safe.
+  * debian/hal.postrm: Don't delgroup the daemon user on purge, deluser
+    already takes care of that. 
+  * debian/hal.postrm: Remove the /var/run/hal dir on purge
 
- -- Sjoerd Simons <sjoerd at debian.org>  Mon,  4 Sep 2006 20:47:30 +0200
+ -- Sjoerd Simons <sjoerd at debian.org>  Mon,  4 Sep 2006 22:08:28 +0200
 
 hal (0.5.7.1-1) unstable; urgency=low
 

Modified: packages/unstable/hal/debian/hal.dirs
===================================================================
--- packages/unstable/hal/debian/hal.dirs	2006-09-04 19:26:05 UTC (rev 989)
+++ packages/unstable/hal/debian/hal.dirs	2006-09-04 21:14:58 UTC (rev 990)
@@ -1,2 +1 @@
-/var/run/hal
 /etc/hal/fdi

Modified: packages/unstable/hal/debian/hal.postinst
===================================================================
--- packages/unstable/hal/debian/hal.postinst	2006-09-04 19:26:05 UTC (rev 989)
+++ packages/unstable/hal/debian/hal.postinst	2006-09-04 21:14:58 UTC (rev 990)
@@ -26,7 +26,7 @@
 case "$1" in
   configure)
     if ! getent passwd haldaemon >/dev/null; then 
-      adduser --disabled-password --quiet --system --home /var/run/hal \
+      adduser --disabled-password --quiet --system --no-create-home \
         --gecos "Hardware abstraction layer" --group haldaemon
     fi
     if ! getent group powerdev > /dev/null; then

Modified: packages/unstable/hal/debian/hal.postrm
===================================================================
--- packages/unstable/hal/debian/hal.postrm	2006-09-04 19:26:05 UTC (rev 989)
+++ packages/unstable/hal/debian/hal.postrm	2006-09-04 21:14:58 UTC (rev 990)
@@ -11,7 +11,7 @@
 
 if [ "$1" = "purge" ] ; then
         deluser --quiet --system haldaemon > /dev/null || true
-        delgroup --quiet --system haldaemon > /dev/null || true
+        rmdir /var/run/hal || true
 fi
 
 exit 0

Modified: packages/unstable/hal/debian/hal.preinst
===================================================================
--- packages/unstable/hal/debian/hal.preinst	2006-09-04 19:26:05 UTC (rev 989)
+++ packages/unstable/hal/debian/hal.preinst	2006-09-04 21:14:58 UTC (rev 990)
@@ -33,6 +33,9 @@
     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
 esac