Imported Debian patch 2.3.1-80

diff --git a/MAKEDEV b/MAKEDEV
index 1f15cd12501b4bcaecc73eec15f8ff89e8459e87..6fba12ad1aaca2478557554ff281ed45afa9dfe5 100644 (file)
--- a/MAKEDEV
+++ b/MAKEDEV
@@ -53,7 +53,7 @@ elif [ -d /dev/.static/dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
 elif [ -d /.dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
     && grep -qE '^[^ ]+ /\.dev' /proc/mounts; then
   cd /.dev/
-elif [ -d .udevdb/ ] && [ "`pwd`" = /dev ]; then
+elif [ -d .udevdb/ -o -d .udev/ ] && [ "`pwd`" = /dev ]; then
   echo ".udevdb presence implies active udev.  Aborting MAKEDEV invocation."
   # use exit 0, not 1, so postinst scripts don't fail on this
   exit 0
@@ -323,7 +323,7 @@ do
                        alpha)
                                $0 $opts generic-alpha
                                ;;
-                       arm)
+                       arm|armeb)
                                $0 $opts generic-arm
                                ;;
                        hppa)
@@ -1109,6 +1109,9 @@ do
                makedev mergemem  c $major 153 $mouse
                makedev pmu       c $major 154 $mouse
                ;;
+       fuse)
+               makedev fuse      c 10 229 $system
+               ;;
        pmu)
                major=`Major mouse 10` || continue
                makedev pmu       c $major 154 $mouse

diff --git a/debian/changelog b/debian/changelog
index ef9df3de5545194b4faa69a2090a98eeb36f7402..ea4cca4bec2a39d2cb946481ac1352d93559ea17 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+makedev (2.3.1-80) unstable; urgency=low
+
+  * make armeb an alias for arm when picking generic target, closes: #333584
+  * change section from base to admin
+  * look for .udev/ in addition to .udevdb/ at Md's request
+  * add target 'fuse', closes: #344728
+
+ -- Bdale Garbee <bdale@gag.com>  Tue, 31 Jan 2006 06:49:21 +1100
+
 makedev (2.3.1-79) unstable; urgency=low
 
   * have init script recognize udev as well as devfs, closes: #326083

diff --git a/debian/control b/debian/control
index 1b2d0186f9b3e88c595228b889a2002cebddac8e..203f207ee4c601e5d997994e44f9d5f32f5eae3c 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,5 +1,5 @@
 Source: makedev
-Section: base
+Section: admin
 Priority: required
 Maintainer: Bdale Garbee <bdale@gag.com>
 Build-Depends-Indep: debhelper