diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/network-manager.preinst | 10 |
2 files changed, 2 insertions, 10 deletions
diff --git a/debian/changelog b/debian/changelog index 792b6190..c13666c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ network-manager (0.8.2-1) UNRELEASED; urgency=low * Make sure gtk-doc API documentation is built - Add Build-Depends on gtk-doc-tools. - Add --with-docs configure option. + * debian/network-manager.preinst + - Remove pre-lenny conffile upgrade code. -- Michael Biebl <biebl@debian.org> Mon, 29 Nov 2010 19:03:34 +0100 diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index c02aca66..acff81f3 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -57,16 +57,6 @@ prep_mv_conffile() { case "$1" in install|upgrade) # 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 - fi - if [ -x "/etc/dbus-1/event.d/26NetworkManagerDispatcher" ]; then - /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 - fi if dpkg --compare-versions "$2" lt "0.7.0~svn3624-1"; then if [ -x "/etc/init.d/network-manager-dispatcher" ]; then invoke-rc.d network-manager-dispatcher stop |