From e99e14a8929514fe64c0734a72ba070073ca23bc Mon Sep 17 00:00:00 2001
From: Michael Biebl <biebl@debian.org>
Date: Sat, 24 Mar 2012 14:26:31 +0100
Subject: Use dh_install maintscript to handle the other conffiles as well.

---
 debian/network-manager.postinst | 16 ----------------
 1 file changed, 16 deletions(-)

(limited to 'debian/network-manager.postinst')

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"
-- 
cgit 1.3.0-6-gf8a5