diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 6 | ||||
| -rw-r--r-- | debian/network-manager.maintscript | 4 | ||||
| -rw-r--r-- | debian/network-manager.postinst | 14 | ||||
| -rw-r--r-- | debian/network-manager.preinst | 6 |
4 files changed, 6 insertions, 24 deletions
diff --git a/debian/changelog b/debian/changelog index 4624df9d..8a334f88 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +network-manager (0.9.8.0-5) UNRELEASED; urgency=low + + * Remove old code for upgrading from pre-squeeze versions. + + -- Michael Biebl <biebl@debian.org> Tue, 07 May 2013 06:41:41 +0200 + network-manager (0.9.8.0-4) unstable; urgency=low * Ensure ActiveConnections are torn down when device is unavailable. Patch diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript index b5c3f356..c77e5105 100644 --- a/debian/network-manager.maintscript +++ b/debian/network-manager.maintscript @@ -1,5 +1 @@ -rm_conffile /etc/init.d/network-manager-dispatcher 0.7.0~svn4191-1~ network-manager -rm_conffile /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules 0.7.0.100-1~ network-manager -rm_conffile /etc/dbus-1/system.d/nm-system-settings.conf 0.7.999-1~ network-manager -mv_conffile /etc/NetworkManager/nm-system-settings.conf /etc/NetworkManager/NetworkManager.conf 0.8.1-2~ network-manager mv_conffile /etc/dbus-1/system.d/NetworkManager.conf /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 0.9.4.0-1~ network-manager diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst index 17c4950d..e93ee3af 100644 --- a/debian/network-manager.postinst +++ b/debian/network-manager.postinst @@ -28,20 +28,6 @@ case "$1" in invoke-rc.d dbus force-reload || true fi - # Update init script priorities - if dpkg --compare-versions "$2" lt "0.7.0.99-1"; then - for i in 0 1 6 ; do - if [ -e /etc/rc$i.d/K14network-manager ]; then - mv /etc/rc$i.d/K14network-manager /etc/rc$i.d/K88network-manager - fi - done - fi - - # Kill nm-system-settings service as in 0.8 it is no longer a separate process - if dpkg --compare-versions "$2" lt "0.7.999-1"; then - kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true - fi - NIF=/etc/network/interfaces if [ -z "$2" ] && [ -f $NIF ]; then ifaces=`grep -v '^#' $NIF | awk '/iface/ {print $2}' | sort -u | sed -e 's/lo//' -e '/^$/d' -e 's/^/- /'` diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst index 2cd96f22..3d522ef1 100644 --- a/debian/network-manager.preinst +++ b/debian/network-manager.preinst @@ -20,12 +20,6 @@ set -e case "$1" in install|upgrade) # Upgrade from previous versions - 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 - fi - update-rc.d network-manager-dispatcher remove >/dev/null - fi if dpkg --compare-versions "$2" lt "0.9.7.997-2"; then # Move old pid file to /var/run/NetworkManager so the init script # doesn't get confused |