[Pkg-utopia-commits] r3758 - in /packages/experimental/hal/debian: changelog hal.postinst hal.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Wed Nov 17 19:53:32 2010
New Revision: 3758

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=3758
Log:
Remove old conffiles in preinst using rm_conffile

Modified:
    packages/experimental/hal/debian/changelog
    packages/experimental/hal/debian/hal.postinst
    packages/experimental/hal/debian/hal.preinst

Modified: packages/experimental/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/changelog?rev=3758&op=diff
==============================================================================
--- packages/experimental/hal/debian/changelog (original)
+++ packages/experimental/hal/debian/changelog Wed Nov 17 19:53:32 2010
@@ -7,7 +7,7 @@
       via systemd.
     - Install both via debian/hal.install, create a symlink for hal.service so
       it is enabled by default when using systemd.
-    - debian/hal.postinst: Remove init.d/default/rc.d files on upgrade.
+    - debian/hal.preinst: Remove init.d/default/rc.d files on upgrade.
     - debian/hal.postinst: When being triggered by an .fdi file update, query
       D-Bus to get the main pid. If hald is running kill the process and
       restart it via D-Bus activation.

Modified: packages/experimental/hal/debian/hal.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/hal.postinst?rev=3758&op=diff
==============================================================================
--- packages/experimental/hal/debian/hal.postinst (original)
+++ packages/experimental/hal/debian/hal.postinst Wed Nov 17 19:53:32 2010
@@ -45,12 +45,6 @@
     addgroup --system --quiet plugdev || true
     addgroup --system --quiet powerdev || true
 
-    # Remove old SysV init scripts, using D-Bus activation now
-    if dpkg --compare-versions "$2" lt-nl "0.5.14-4"; then
-      rm -f /etc/init.d/hal /etc/default/hal
-      update-rc.d -f hal remove >/dev/null
-    fi
-
     # Update haldaemon home directory
     if dpkg --compare-versions "$2" lt-nl "0.5.12~git20090406.46dc48-1"; then
       usermod --home /var/run/hald haldaemon || true
@@ -85,8 +79,8 @@
     # restart hald if it was running before
     pid=$(get_pid org.freedesktop.Hal)
     if [ -n "$pid" ]; then
-        kill $pid 2>/dev/null || true
-        lshal >/dev/null || true # will trigger through D-Bus activation
+      kill $pid 2>/dev/null || true
+      lshal >/dev/null || true # will trigger through D-Bus activation
     fi
     exit 0
   ;;

Modified: packages/experimental/hal/debian/hal.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/experimental/hal/debian/hal.preinst?rev=3758&op=diff
==============================================================================
--- packages/experimental/hal/debian/hal.preinst (original)
+++ packages/experimental/hal/debian/hal.preinst Wed Nov 17 19:53:32 2010
@@ -48,6 +48,12 @@
     if dpkg --compare-versions "$2" lt "0.5.12~git20090406.46dc48-1"; then
       rm_conffile "/etc/udev/rules.d/90-hal.rules"
     fi
+    # Remove old SysV init scripts, using D-Bus activation now
+    if dpkg --compare-versions "$2" lt-nl "0.5.14-4"; then
+      rm_conffile /etc/init.d/hal
+      rm_conffile /etc/default/hal
+      update-rc.d -f hal remove >/dev/null
+    fi
 esac
 
 #DEBHELPER#