Use dh_install maintscript to handle the other conffiles as well.

4 files changed, 6 insertions, 62 deletions

diff --git a/debian/changelog b/debian/changelog
index 338d95d7..a47542e3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,8 +22,9 @@ network-manager (0.9.4.0-1) UNRELEASED; urgency=low
     and use the dh_install maintscript facility to move the conffile on
     upgrades. This requires a newer debhelper, so bump the Build-Depends
     accordingly.
+  * Use dh_install maintscript to handle the other conffiles as well.
 
- -- Michael Biebl <biebl@debian.org>  Sat, 24 Mar 2012 14:10:28 +0100
+ -- Michael Biebl <biebl@debian.org>  Sat, 24 Mar 2012 14:26:08 +0100
 
 network-manager (0.9.2.0-2) unstable; urgency=low
 
diff --git a/debian/network-manager.maintscript b/debian/network-manager.maintscript
index 2665d2d7..cc66dea0 100644
--- a/debian/network-manager.maintscript
+++ b/debian/network-manager.maintscript
@@ -1 +1,5 @@
+rm_conffile /etc/init.d/network-manager-dispatcher 0.6.6-3 network-manager
+rm_conffile /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules 0.7.0.99-1 network-manager
+rm_conffile /etc/dbus-1/system.d/nm-system-settings.conf 0.7.2-2 network-manager
+mv_conffile /etc/NetworkManager/nm-system-settings.conf /etc/NetworkManager/NetworkManager.conf 0.8.1-1 network-manager
 mv_conffile /etc/dbus-1/system.d/NetworkManager.conf /etc/dbus-1/system.d/org.freedesktop.NetworkManager.conf 0.9.2.0-2 network-manager
diff --git a/debian/network-manager.postinst b/debian/network-manager.postinst
index 691f1402..b2dd4353 100644
--- a/debian/network-manager.postinst
+++ b/debian/network-manager.postinst
@@ -18,18 +18,6 @@ set -e
 # If prerm fails during replacement due to conflict:
 #	<postinst> abort-remove in-favour <new-package> <version>
 
-# Move a conffile without triggering a dpkg question
-mv_conffile() {
-    local OLDCONFFILE="$1"
-    local NEWCONFFILE="$2"
-
-    [ -e "$OLDCONFFILE" ] || return 0
-
-    echo "Preserving user changes to $NEWCONFFILE ..."
-    mv -f "$NEWCONFFILE" "$NEWCONFFILE".dpkg-new
-    mv -f "$OLDCONFFILE" "$NEWCONFFILE"
-}
-
 case "$1" in
     configure)
 
@@ -54,10 +42,6 @@ case "$1" in
             kill `pidof /usr/sbin/nm-system-settings` 2>/dev/null || true
         fi
 
-        if dpkg --compare-versions "$2" lt "0.8.1-2"; then
-            mv_conffile "/etc/NetworkManager/nm-system-settings.conf" "/etc/NetworkManager/NetworkManager.conf"
-        fi
-
         if [ -z "$2" ] || dpkg --compare-versions "$2" lt-nl "0.8.1-4"; then
             if [ -f /etc/network/interfaces ]; then
                 echo "Disabling interfaces configured with plain DHCP in /etc/network/interfaces so that NetworkManager can take them over"
diff --git a/debian/network-manager.preinst b/debian/network-manager.preinst
index acff81f3..985b65ad 100644
--- a/debian/network-manager.preinst
+++ b/debian/network-manager.preinst
@@ -17,43 +17,6 @@ set -e
 # If postrm fails during upgrade or fails on failed upgrade:
 #	<old-preinst> abort-upgrade <new-version>
 
-
-# Remove a no-longer used conffile
-rm_conffile()
-{
-    local PKGNAME="$1"
-    local CONFFILE="$2"
-
-    [ -e "$CONFFILE" ] || return 0
-
-    local md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`"
-    local old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | \
-            sed -n -e \"\\\\' $CONFFILE'{s/ obsolete$//;s/.* //p}\"`"
-    if [ "$md5sum" != "$old_md5sum" ]; then
-        echo "Obsolete conffile $CONFFILE has been modified by you."
-        echo "Saving as $CONFFILE.dpkg-bak ..."
-        mv -f "$CONFFILE" "$CONFFILE".dpkg-bak
-    else
-        echo "Removing obsolete conffile $CONFFILE ..."
-        rm -f "$CONFFILE"
-    fi
-}
-
-# Prepare to move a conffile without triggering a dpkg question
-prep_mv_conffile() {
-    local PKGNAME="$1"
-    local CONFFILE="$2"
-
-    [ -e "$CONFFILE" ] || return 0
-
-    local md5sum="$(md5sum $CONFFILE | sed -e 's/ .*//')"
-    local old_md5sum="$(dpkg-query -W -f='${Conffiles}' $PKGNAME | \
-            sed -n -e "\' $CONFFILE ' { s/ obsolete$//; s/.* //; p }")"
-    if [ "$md5sum" = "$old_md5sum" ]; then
-        rm -f "$CONFFILE"
-    fi
-}
-
 case "$1" in
     install|upgrade)
 	# Upgrade from previous versions
@@ -61,23 +24,15 @@ case "$1" in
 	    if [ -x "/etc/init.d/network-manager-dispatcher" ]; then
 	        invoke-rc.d network-manager-dispatcher stop
 	    fi
-	    rm_conffile network-manager /etc/init.d/network-manager-dispatcher
 	    update-rc.d network-manager-dispatcher remove >/dev/null
 	fi
 	if dpkg --compare-versions "$2" lt "0.7.0.100-1"; then
-	    rm_conffile network-manager /etc/udev/rules.d/77-nm-probe-modem-capabilities.rules
 	    # Move old pid file to /var/run, so /var/run/NetworkManager can be removed
 	    # cleanly on upgrades and the daemon can be stopped correctly in postinst
 	    if [ -f /var/run/NetworkManager/NetworkManager.pid ]; then
 	        mv /var/run/NetworkManager/NetworkManager.pid /var/run/
 	    fi
 	fi
-	if dpkg --compare-versions "$2" lt "0.7.999-1"; then
-	    rm_conffile network-manager /etc/dbus-1/system.d/nm-system-settings.conf
-	fi
-	if dpkg --compare-versions "$2" lt "0.8.1-2"; then
-	    prep_mv_conffile network-manager /etc/NetworkManager/nm-system-settings.conf
-	fi
 	;;
 
     abort-upgrade)