From cdf394cc4498e09d3d2c1f46147d9dce82f5ec61 Mon Sep 17 00:00:00 2001
From: Bdale Garbee <bdale@gag.com>
Date: Mon, 14 Mar 2005 16:53:32 -0700
Subject: [PATCH] Imported Debian patch 2.3.1-77

---
 MAKEDEV              | 22 +++++++++++++++++-----
 debian/README.Debian |  3 ---
 debian/changelog     | 12 ++++++++++++
 debian/rules         |  2 +-
 4 files changed, 30 insertions(+), 9 deletions(-)
 delete mode 100644 debian/README.Debian

diff --git a/MAKEDEV b/MAKEDEV
index 62d6ee6..d9224a4 100644
--- a/MAKEDEV
+++ b/MAKEDEV
@@ -44,10 +44,19 @@ major_lp=6
 
 #---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#
 
-# if udev is running, and we're in /dev, relocate ourselves 
-if [ -d /.dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
-   && grep -qE '^[^ ]+ /\.dev' /proc/mounts; then
-	cd /.dev/
+# try to do the right things if udev is running
+if [ "$WRITE_ON_UDEV" ]; then
+  :
+elif [ -d /dev/.static/dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
+    && grep -qE '^[^ ]+ /dev/\.static/dev' /proc/mounts; then
+  cd /dev/.static/dev/
+elif [ -d /.dev/ ] && [ "`pwd`" = /dev ] && [ -e /proc/mounts ] \
+    && grep -qE '^[^ ]+ /\.dev' /proc/mounts; then
+  cd /.dev/
+elif [ -d .udevdb/ ] && [ "`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
 fi
 
 #---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#---#
@@ -1045,7 +1054,7 @@ do
 		major=`Major $arg 10` || continue
 		makedev $arg	c $major 175 $video
 		;;
-	hwrandom)
+	hwrng)
 		major=`Major $arg 10` || continue
 		makedev $arg	c $major 183 $private
 		;;
@@ -1128,6 +1137,9 @@ do
 	systrace)
 		makedev systrace  c 10 226 $private
 		;;
+	uinput)
+		makedev input/uinput  c 10 223 $mouse
+		;;
 	js)
 		major=`Major Joystick 13` || continue
 		for unit in 0 1 2 3
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index f6481f3..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,3 +0,0 @@
-This version of makedev is not particularly happy on systems running devfs.  
-All bugs regarding devfs interaction will be retained at severity 'wishlist'
-until we figure out what makedev's interaction with devfs should be...
diff --git a/debian/changelog b/debian/changelog
index b98bafe..8c203a7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+makedev (2.3.1-77) unstable; urgency=medium
+
+  * update udev handling on advice from Marco d'Itri.  Handles more cases
+    and provides the ability to override the avoidance logic if environment
+    variable WRITE_ON_UDEV is set.  Urgency medium to help a new udev upload 
+    depending on this behavior get into sarge.  closes: #264421
+  * change hwrandom to hwrng, closes: #295324
+  * patch from Gaudenz Steinlin to add input/uinput support, closes: #294361
+  * remove README.Debian, since the content is obsolete
+
+ -- Bdale Garbee <bdale@gag.com>  Mon, 14 Mar 2005 16:53:32 -0700
+
 makedev (2.3.1-76) unstable; urgency=low
 
   * make ppc64 an alias for powerpc, closes: #282687
diff --git a/debian/rules b/debian/rules
index bde3903..10bacb4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,7 +30,7 @@ binary-indep: build
 	dh_installmenu -i
 	dh_installinit -i
 	dh_installcron -i
-	dh_installmanpages -i
+	dh_installman -i MAKEDEV.man 
 	dh_installchangelogs -i
 	dh_strip -i
 	dh_compress -i
-- 
2.30.2