Imported Debian patch 2.3.1-87

diff --git a/MAKEDEV b/MAKEDEV
index bc781a82413b22d41ab517fff61a08be9a665b10..c8b1e133986134662c36b032716f055c881aa688 100644 (file)
--- a/MAKEDEV
+++ b/MAKEDEV
@@ -1096,7 +1096,7 @@ do
                makedev irnet c 10 187 $system
                ;;
        cbm)
-               makedev cbm c 10 177 $system
+               makedev cbm c 10 177 $floppy
                ;;
        misc)
                major=`Major mouse 10` || continue

diff --git a/debian/changelog b/debian/changelog
index 97bce57c5818332d7a910929afd9a8b731e36e21..66265c649ab5ca2a45991a252c1857b72cb0ffda 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+makedev (2.3.1-87) unstable; urgency=low
+
+  * move cbm target to group floppy, closes: #462892
+  * since we previously only ran update-rc.d to remove links on purge, they
+    may still be left around even though the init.d has been removed.  Update
+    the preinst to call update-rc.d when upgrading to clean up this case,
+    closes: #465739
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 14 Feb 2008 16:14:10 -0700
+
 makedev (2.3.1-86) unstable; urgency=low
 
   * oops, fix a bashism I introduced in the postinst of -85, closes: #462769

diff --git a/debian/preinst b/debian/preinst
index 4575a58cdb5a9d3a051ca6254bb92d1dfc7811a9..fe5a69fb99d6cde01cd8c55ca80d84b9f4f194a4 100644 (file)
--- a/debian/preinst
+++ b/debian/preinst
@@ -17,10 +17,12 @@ rm_conffile() {
         fi
     fi
 }
+
 case "$1" in
 install|upgrade)
-    if dpkg --compare-versions "$2" le "2.3.1-85"; then
-        rm_conffile makedev /etc/init.d/makedev
+    if dpkg --compare-versions "$2" le "2.3.1-87"; then
+       rm_conffile makedev /etc/init.d/makedev
+       update-rc.d makedev remove >/dev/null || exit $?
     fi
 esac