From c05e4a7131051c445516f91e88b3a2ad6db2dbeb Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Thu, 14 Feb 2008 16:14:10 -0700
Subject: [PATCH] Imported Debian patch 2.3.1-87

---
 MAKEDEV          |  2 +-
 debian/changelog | 10 ++++++++++
 debian/preinst   |  6 ++++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/MAKEDEV b/MAKEDEV
index bc781a8..c8b1e13 100644
--- 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 97bce57..66265c6 100644
--- 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 4575a58..fe5a69f 100644
--- 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
 
-- 
2.30.2