r14591 - in /desktop/unstable/system-tools-backends/debian: changelog system-tools-backends.preinst

[joss at users.alioth.debian.org]

Author: joss
Date: Sat Feb 16 00:07:00 2008
New Revision: 14591

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14591
Log:
* Handle gracefully the case where the daemon fails to stop in the
* Really remove the conffile by passing all arguments to rm_conffile.

Modified:
    desktop/unstable/system-tools-backends/debian/changelog
    desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst

Modified: desktop/unstable/system-tools-backends/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/changelog?rev=14591&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/changelog (original)
+++ desktop/unstable/system-tools-backends/debian/changelog Sat Feb 16 00:07:00 2008
@@ -21,8 +21,9 @@
   * Entirely remove the old dbus script.
   * Standards version is 3.7.3.
   * Don’t stop the init script in the S runlevel.
-  * Handle gracefully the case where the daemon fails to stop in the 
+  * Handle gracefully the case where the daemon fails to stop in the
     preinst.
+  * Really remove the conffile by passing all arguments to rm_conffile.
 
  -- Josselin Mouette <joss at debian.org>  Sat, 16 Feb 2008 00:36:20 +0100
 

Modified: desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst?rev=14591&op=diff
==============================================================================
--- desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst (original)
+++ desktop/unstable/system-tools-backends/debian/system-tools-backends.preinst Sat Feb 16 00:07:00 2008
@@ -27,7 +27,7 @@
 	if dpkg --compare-versions "$2" lt 2.2.1-5; then
 	    test -x /etc/dbus-1/event.d/70system-tools-backends && \
 		/etc/dbus-1/event.d/70system-tools-backends stop || true
-	    rm_conffile "/etc/dbus-1/event.d/70system-tools-backends"
+	    rm_conffile system-tools-backends "/etc/dbus-1/event.d/70system-tools-backends"
 	fi
 	;;
 esac