From a2673cf9f82250cfa4615b8afc6c3156e1c13dc0 Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Tue, 31 Jan 2006 06:49:21 +1100 Subject: [PATCH] Imported Debian patch 2.3.1-80 --- MAKEDEV | 7 +++++-- debian/changelog | 9 +++++++++ debian/control | 2 +- 3 files changed, 15 insertions(+), 3 deletions(-) diff --git a/MAKEDEV b/MAKEDEV index 1f15cd1..6fba12a 100644 --- 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 ef9df3d..ea4cca4 100644 --- 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 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 1b2d018..203f207 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,5 @@ Source: makedev -Section: base +Section: admin Priority: required Maintainer: Bdale Garbee Build-Depends-Indep: debhelper -- 2.30.2