diff options
| -rw-r--r-- | debian/changelog | 3 | ||||
| -rw-r--r-- | debian/network-manager.preinst | 7 |
2 files changed, 8 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog index 5f4d5fab..5ad5ad3c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -33,6 +33,9 @@ network-manager (0.7.998-1) UNRELEASED; urgency=low - Update LSB header: Replace hal dependency with udev. - The nm-system-settings daemon has been merged into the NetworkManager daemon, so we no longer need to kill nm-system-settings on "stop". + * debian/network-manager.preinst + - Remove the obsolete conffile + /etc/dbus-1/system.d/nm-system-settings.conf on upgrades. -- Michael Biebl <biebl@debian.org> Sun, 29 Nov 2009 10:19:59 +0100 diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 5bfef656..c00618e7 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -44,10 +44,10 @@ case "$1" in # Upgrade from previous versions if dpkg --compare-versions "$2" lt "0.6.4-8"; then if [ -x "/etc/dbus-1/event.d/25NetworkManager" ]; then - /etc/dbus-1/event.d/25NetworkManager stop + /etc/dbus-1/event.d/25NetworkManager stop fi if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then - /etc/dbus-1/event.d/26NetworkManagerDispatcher stop + /etc/dbus-1/event.d/26NetworkManagerDispatcher stop fi rm_conffile network-manager /etc/dbus-1/event.d/25NetworkManager rm_conffile network-manager /etc/dbus-1/event.d/26NetworkManagerDispatcher @@ -67,6 +67,9 @@ case "$1" in mv /var/run/NetworkManager/NetworkManager.pid /var/run/ fi fi + if dpkg --compare-versions "$2" lt "0.7.998-1"; then + rm_conffile network-manager /etc/dbus-1/system.d/nm-system-settings.conf + fi ;; abort-upgrade) |