Imported Debian patch 2.3.1-88

diff --git a/MAKEDEV b/MAKEDEV
index c8b1e133986134662c36b032716f055c881aa688..94453e1d1afd859d538142511fc4d089a9c9c453 100644 (file)
--- a/MAKEDEV
+++ b/MAKEDEV
@@ -31,7 +31,7 @@ scanner="  root root   0666"
    coda="  root root   0600"
   ipsec="  root root   0200"
 readable="  root root   0444"
-   lirc="  root lirc   0640"
+   lirc="  root video   0640"
 
 MAXVT=63
 
@@ -151,6 +151,38 @@ makedev () {       # usage: makedev name [bcu] major minor owner group mode
                fi
        fi
 }
+makefifo () { # usage: makefifo name owner group mode
+       if [ "$opt_v" ]
+       then    if [ "$opt_d" ]
+               then    echo "delete $1"
+               else    echo "create $1 $2:$3 $4" 
+               fi
+       fi
+       # missing parameters are a bug - bail - should we do an exit 1 here?
+       case :$1:$2:$3:$4: in
+               *::*) echo "Warning: MAKEFIFO $@ is missing parameter(s)." >&2;;
+       esac
+       if [ ! "$opt_n" ]
+       then    
+               if [ "$opt_d" ]
+               then
+                       rm -f $1
+               else
+                       rm -f $1-
+                       if mknod $1- p &&
+                          chown $2:$3 $1- &&
+                          chmod $4 $1- &&
+                          mv $1- $1
+                       then
+                               :       # it worked
+                       else
+                                       # Didn't work, clean up any mess...
+                               echo "makefifo $@: failed"
+                               rm -f $1-
+                       fi
+               fi
+       fi
+}
 symlink () {   # usage: symlink name target
        if [ "$opt_v" ]
        then    if [ "$opt_d" ]
@@ -2103,9 +2135,9 @@ do
                done
                 ;;
         lirc)
-                mknod lirc c 61 0 $lirc
+                makedev lirc c 61 0 $lirc
                 for i in d m; do
-                   makedev lirc${i} p $lirc
+                   makefifo lirc${i} $lirc
                 done
                 ;;
        update)

diff --git a/debian/changelog b/debian/changelog
index 66265c649ab5ca2a45991a252c1857b72cb0ffda..7c549d0678cfcb5acf4c80c367de3fa32f7e7a6e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+makedev (2.3.1-88) unstable; urgency=low
+
+  * no need to squelch output of update-rc.d in preinst
+  * patch from Stefan Lippers-Hollmann to fix lirc fifos, closes: #472526
+
+ -- Bdale Garbee <bdale@gag.com>  Thu, 08 May 2008 08:28:21 -0600
+
 makedev (2.3.1-87) unstable; urgency=low
 
   * move cbm target to group floppy, closes: #462892

diff --git a/debian/dirs b/debian/dirs
index 2aba4a957393f7ad3408dd95e83312d13786fdd7..b799fb4040e58ad64674bbc0a5e8d177eb7e0390 100644 (file)
--- a/debian/dirs
+++ b/debian/dirs
@@ -1,2 +1,3 @@
 sbin
 usr/share/man/man8
+usr/share/lintian/overrides

diff --git a/debian/makedev.lintian b/debian/makedev.lintian
new file mode 100644 (file)
index 0000000..0eaa543
--- /dev/null
+++ b/debian/makedev.lintian
@@ -0,0 +1 @@
+makedev: copyright-without-copyright-notice

diff --git a/debian/preinst b/debian/preinst
index fe5a69fb99d6cde01cd8c55ca80d84b9f4f194a4..88a8cc6a9971ba3109eba3824c1697027b54f069 100644 (file)
--- a/debian/preinst
+++ b/debian/preinst
@@ -22,7 +22,7 @@ case "$1" in
 install|upgrade)
     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 $?
+       update-rc.d makedev remove
     fi
 esac
 

diff --git a/debian/rules b/debian/rules
index 8fec6ff7fa8b55111d5e70ee3933031697e52690..f90578c78b61d84e1b52962349a48b6ac10eadb6 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,9 @@ binary-indep: build
 
        ROOT=debian/makedev $(MAKE) install 
 
+       install -o root -g root -m 0644 debian/makedev.lintian \
+               debian/makedev/usr/share/lintian/overrides/makedev
+
        dh_installdocs  -i
        dh_installexamples -i
        dh_installmenu -i