Imported Debian patch 2.3.1-84

diff --git a/MAKEDEV b/MAKEDEV
index d2e07f091b9a132be38d9711f4797bf8f2fa90e3..7a5ffef905a718a33a22217fb03c0042ee0ad393 100644 (file)
--- a/MAKEDEV
+++ b/MAKEDEV
@@ -327,7 +327,7 @@ do
                        alpha)
                                $0 $opts generic-alpha
                                ;;
-                       arm|armeb)
+                       arm|armeb|armel)
                                $0 $opts generic-arm
                                ;;
                        hppa)
@@ -1094,6 +1094,9 @@ do
        irnet)
                makedev irnet c 10 187 $system
                ;;
+       cbm)
+               makedev irnet c 10 177 $system
+               ;;
        misc)
                major=`Major mouse 10` || continue
                makedev logibm    c $major 0 $mouse
@@ -1154,6 +1157,7 @@ do
                makedev systrace  c 10 226 $private
                ;;
        uinput)
+               mkdir -p input
                makedev input/uinput  c 10 223 $mouse
                ;;
        js)

diff --git a/debian/changelog b/debian/changelog
index ab5f1ecca0e1478fc71b9546fbe281dae4203b95..a8aa7e87a4d0a2f798bcdb3c1e04e0d433240ac6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+makedev (2.3.1-84) unstable; urgency=low
+
+  * add 'fd' to the list of targets created in the postinst, closes: #394863
+  * ensure subdir exists before trying to make uinput, closes: #406890
+  * add armel to the architecture list, closes: #408810
+  * correct LSB-formatted init.d script meta info, closes: #386712
+  * init.d script is no longer needed, so remove it.  closes: #428222
+  * add cbm target, closes: #437329
+
+ -- Bdale Garbee <bdale@gag.com>  Fri, 28 Sep 2007 16:02:27 +0900
+
 makedev (2.3.1-83) unstable; urgency=low
 
   * make urandom permissions match random, closes: #332983

diff --git a/debian/init.d b/debian/init.d
deleted file mode 100644 (file)
index d1d01cf..0000000
--- a/debian/init.d
+++ /dev/null
@@ -1,43 +0,0 @@
-#! /bin/sh
-
-### BEGIN INIT INFO
-# Provides:            makedev
-# Required-Start:      $local_fs
-# Required-Stop:       $local_fs
-# Default-Start:       2 3 4 5
-# Default-Stop:                0 1 6
-# Short-Description:   Creates device files in /dev
-### END INIT INFO
-
-N=/etc/init.d/makedev
-PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
-
-set -e
-
-case "$1" in
-  start)
-       test -L /dev/MAKEDEV || ln -fs /sbin/MAKEDEV /dev/MAKEDEV
-
-       # create dvb-devices, if the dvb-directory allready exists, and 
-       # no devfs or udev is in use (workaround for the changed major-number
-       # of the dvb-devices, introduced in kernel 2.6.8, to be able to 
-       # switch between kernels <= 2.6.7 and >= 2.6.8, without manual 
-       # recreation of the devices (MAKEDEV dvb checks the kernel-version 
-       # and uses the correct major-number))
-       
-       if [ ! -e /dev/.devfsd -a ! -e /dev/.udevdb -a ! -e /dev/.udev ]; then
-               if [ -d /dev/dvb ]; then
-                       cd /dev && ./MAKEDEV dvb
-               fi
-       fi
-       
-       ;;
-  stop|reload|restart|force-reload)
-       ;;
-  *)
-       echo "Usage: $N {start|stop|restart|force-reload}" >&2
-       exit 1
-       ;;
-esac
-
-exit 0

diff --git a/debian/postinst b/debian/postinst
index 2a255c85052eff0d18378844f53bbf3d588a20f7..2f269adf6f9edb51e4f64393da5ab426b2dd4b38 100644 (file)
--- a/debian/postinst
+++ b/debian/postinst
@@ -14,8 +14,7 @@ then
     exit 0
 fi
 
-/sbin/MAKEDEV std
-/sbin/MAKEDEV consoleonly
+/sbin/MAKEDEV std consoleonly fd
 
 /bin/chmod g-r,o= /dev/tty[0-9]*
 

diff --git a/debian/rules b/debian/rules
index fa0ddf1e68e8591875beb944b7f4b141b9ce4630..8fec6ff7fa8b55111d5e70ee3933031697e52690 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -13,7 +13,7 @@ clean:
        dh_testdir
        dh_testroot
        rm -f build-stamp
-       -$(MAKE) clean
+       [ ! -f Makefile ] || $(MAKE) clean
        -rm -f debian/devices.txt debian/devices*html
        dh_clean