[Pkg-dkms-commits] [SCM] Dynamic Kernel Module Support branch, master, updated. debian/2.1.1.1-1-7-gaf8bb12

[Giuseppe Iuculano]

The following commit has been merged in the master branch:
commit adb3042a0065213fcd96f38aded2190cc17b057b
Author: Giuseppe Iuculano <iuculano at debian.org>
Date:   Sun Feb 14 11:56:59 2010 +0100

    Really remove obsolete conffiles

diff --git a/debian/postinst b/debian/postinst
index 9b995bd..06e88f7 100644
--- a/debian/postinst
+++ b/debian/postinst
@@ -15,19 +15,6 @@ if dpkg --compare-versions "$2" lt-nl "2.0.21.1-1~" ; then
 			rm -f /etc/modprobe.d/dkms
 		fi
 	fi
-
-	if [ -e "/etc/kernel/header_postinst.d/dkms" ]; then
-		md5sum=$(md5sum /etc/kernel/header_postinst.d/dkms | sed -e 's/ .*//')
-		old_md5sum=$(dpkg-query -W -f='${Conffiles}' dkms | \
-			sed -n -e "\' /etc/kernel/header_postinst.d/dkms ' { s/ obsolete$//; s/.* //; p }")
-			if [ "$md5sum" = "$old_md5sum" ]; then
-				echo "Removing obsolete conffile /etc/kernel/header_postinst.d/dkms ..."
-				rm -f /etc/kernel/header_postinst.d/dkms
-				rmdir --ignore-fail-on-non-empty /etc/kernel/header_postinst.d/
-			fi
-	fi
-	# must do a remove first to un-do the "bad" links created by previous version
-	update-rc.d -f dkms_autoinstaller remove >/dev/null 2>&1
 fi
 
 #DEBHELPER#
diff --git a/debian/preinst b/debian/preinst
index c2d1c74..df02fae 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -23,13 +23,17 @@ rm_conffile() {
 
 case "$1" in
 install|upgrade)
-    if dpkg --compare-versions "$2" le "2.1.00.0-1"; then
+    if dpkg --compare-versions "$2" le "2.1.1.1-2"; then
         rm_conffile dkms "/etc/dkms/template-dkms-mkdeb/debian/postrm"
-    fi
-
-    if dpkg --compare-versions "$2" le "2.1.1.0-0ubuntu7"; then
-        rm_conffile dkms "/etc/init.d/dkms_autoinstaller"
+	if [ -e "/etc/init.d/dkms_autoinstaller" ]; then
+		update-rc.d -f dkms_autoinstaller remove >/dev/null 2>&1
+		rm_conffile dkms "/etc/init.d/dkms_autoinstaller"
+	fi
         rm_conffile dkms "/etc/init/dkms_autoinstaller.conf"
+	if [ -e "/etc/kernel/header_postinst.d/dkms" ]; then
+		rm_conffile dkms "/etc/kernel/header_postinst.d/dkms"
+		rmdir --ignore-fail-on-non-empty /etc/kernel/header_postinst.d/
+	fi
     fi
-esac
 
+esac

-- 
Dynamic Kernel Module Support