[Pkg-utopia-commits] r1469 - in /packages/unstable/hal/debian: changelog hal.postinst hal.postrm hal.preinst

[biebl at users.alioth.debian.org]

Author: biebl
Date: Thu May  3 21:39:57 2007
New Revision: 1469

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=1469
Log:
* debian/hal.postrm
  + Reload dbus only on purge, i.e. when the conffile
    /etc/dbus-1/system.d/hal.conf is removed.
* debian/hal.{preinst,postinst}
  + Remove some old upgrade paths for the hal init script.


Modified:
    packages/unstable/hal/debian/changelog
    packages/unstable/hal/debian/hal.postinst
    packages/unstable/hal/debian/hal.postrm
    packages/unstable/hal/debian/hal.preinst

Modified: packages/unstable/hal/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/changelog?rev=1469&op=diff
==============================================================================
--- packages/unstable/hal/debian/changelog (original)
+++ packages/unstable/hal/debian/changelog Thu May  3 21:39:57 2007
@@ -22,6 +22,11 @@
   * debian/control
     + Drop the Build-Depends: linux-kernel-headers (>= 2.6.17). 
       linux-libc-dev in unstable is recent enough.
+  * debian/hal.postrm
+    + Reload dbus only on purge, i.e. when the conffile
+      /etc/dbus-1/system.d/hal.conf is removed.
+  * debian/hal.{preinst,postinst}
+    + Remove some old upgrade paths for the hal init script.
 
   [ Sjoerd Simons ]
   * debian/libhal1.shlibs, debian/libhal-storage1.shlibs: Bump shlibs

Modified: packages/unstable/hal/debian/hal.postinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.postinst?rev=1469&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.postinst (original)
+++ packages/unstable/hal/debian/hal.postinst Thu May  3 21:39:57 2007
@@ -41,12 +41,6 @@
     # be sure the run dir is owned by the hal user
     chown haldaemon:haldaemon /var/run/hal 2>/dev/null || true
 
-    if [ -f /etc/init.d/hal ]; then
-      # handle upgrades
-      mv /etc/init.d/hal /etc/dbus-1/event.d/
-      update-rc.d hal remove
-    fi
- 
     if [ -x /etc/init.d/dbus ]; then
       invoke-rc.d dbus force-reload || true
       /etc/dbus-1/event.d/20hal start || true

Modified: packages/unstable/hal/debian/hal.postrm
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.postrm?rev=1469&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.postrm (original)
+++ packages/unstable/hal/debian/hal.postrm Thu May  3 21:39:57 2007
@@ -2,14 +2,15 @@
 
 set -e
 
-# Do not restart dbus on upgrades, only if we remove the package.
-if [ -x /etc/init.d/dbus ]; then
-  invoke-rc.d dbus force-reload || true
-fi
-
 #DEBHELPER#
 
 if [ "$1" = "purge" ] ; then
+	# Tell dbus to reload it's configuration files only, when we purge the
+	# package, i.e. when we remove its conffiles in /etc/dbus-1/system.d/
+  	if [ -x /etc/init.d/dbus ]; then
+		invoke-rc.d dbus force-reload || true
+  	fi
+
         deluser --quiet --system haldaemon > /dev/null || true
         rmdir /var/run/hal || true
 fi

Modified: packages/unstable/hal/debian/hal.preinst
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/hal/debian/hal.preinst?rev=1469&op=diff
==============================================================================
--- packages/unstable/hal/debian/hal.preinst (original)
+++ packages/unstable/hal/debian/hal.preinst Thu May  3 21:39:57 2007
@@ -42,15 +42,9 @@
 if [ "$1" = "upgrade" ]; then
   if [ -x /etc/dbus-1/event.d/20hal ]; then
     /etc/dbus-1/event.d/20hal stop
-  else 
-    # Really old version of hal have the dbus init script in another location
-    # Fallback to manual..
-    start-stop-daemon --quiet --stop --oknodo --exec /usr/sbin/hald
   fi
 fi
 
-if [ -f /etc/dbus-1/event.d/hal ]; then
-	mv /etc/dbus-1/event.d/hal /etc/dbus-1/event.d/20hal
-fi
+#DEBHELPER#
 
-#DEBHELPER#
+exit 0