- move compressed patch to distfiles

[packages/fdutils.git] / fdutils-diskd-conflict.patch

diff -Nur fdutils-5.4.orig/doc/cmdname fdutils-5.4/doc/cmdname
--- fdutils-5.4.orig/doc/cmdname	Sat Apr 19 18:28:16 1997
+++ fdutils-5.4/doc/cmdname	Thu Aug 22 22:10:14 2002
@@ -1,4 +1,4 @@
-diskd - disk daemon; wait for disk to be inserted
+fddiskd - disk daemon; wait for disk to be inserted
 diskseek, diskseekd - disk seek daemon; simulates Messy Dos' drive cleaning effect
 fd - floppy disk device
 fdmount - Floppy disk mount utility
diff -Nur fdutils-5.4.orig/doc/commands.texi fdutils-5.4/doc/commands.texi
--- fdutils-5.4.orig/doc/commands.texi	Thu Apr 24 23:38:57 1997
+++ fdutils-5.4/doc/commands.texi	Thu Aug 22 22:11:31 2002
@@ -7,7 +7,7 @@
 line parameters that each of them accepts.
 
 @menu
-* diskd::             detect a disk change and execute a command
+* fddiskd::           detect a disk change and execute a command
 * diskseekd::         seeks the drive from time to time to shake of the
                       dust
 * fdmount::           automatically mounts and unmounts floppy disks
--- fdutils-5.5/doc/diskd.1.orig	2005-03-03 22:55:18.000000000 +0100
+++ fdutils-5.5/doc/diskd.1	2008-02-09 16:01:43.668973107 +0100
@@ -1,6 +1,6 @@
-.TH diskd 1 "03Mar05" fdutils-5.5
+.TH fddiskd 1 "03Mar05" fdutils-5.5
 .SH Name
-diskd - disk daemon; wait for disk to be inserted
+fddiskd - disk daemon; wait for disk to be inserted
 '\" t
 .de TQ
 .br
@@ -70,15 +70,15 @@ The texinfo doc looks most pretty when p
 the info version certain examples are difficult to read due to the
 quoting conventions used in info.
 .SH Description
-.iX "p diskd"
+.iX "p fddiskd"
 .PP
-The diskd command has the following syntax:
+The fddiskd command has the following syntax:
 .PP
  
 .nf
 .ft 3
 .in +0.3i
-\&\fR\&\f(CWdiskd [\fR\&\f(CW-d \fIdrive\fR\&\f(CW] [\fR\&\f(CW-i \fIinterval\fR\&\f(CW] [\fR\&\f(CW-e \fIcommand\fR\&\f(CW]
+\&\fR\&\f(CWfddiskd [\fR\&\f(CW-d \fIdrive\fR\&\f(CW] [\fR\&\f(CW-i \fIinterval\fR\&\f(CW] [\fR\&\f(CW-e \fIcommand\fR\&\f(CW]
 .fi
 .in -0.3i
 .ft R
--- fdutils-5.5/doc/diskd.texi.orig	2003-07-12 21:17:07.000000000 +0200
+++ fdutils-5.5/doc/diskd.texi	2008-02-09 16:02:23.727255898 +0100
@@ -1,11 +1,11 @@
-@node diskd, diskseekd, Commands, Commands
-@section diskd
-@pindex diskd
+@node fddiskd, diskseekd, Commands, Commands
+@section fddiskd
+@pindex fddiskd
 
-The diskd command has the following syntax:
+The fddiskd command has the following syntax:
 
 @example
-@code{diskd} [@code{-d} @var{drive}] [@code{-i} @var{interval}] [@code{-e} @var{command}]
+@code{fddiskd} [@code{-d} @var{drive}] [@code{-i} @var{interval}] [@code{-e} @var{command}]
 @end example
 
 Diskd waits for a disk to be inserted into a given @var{drive}, and then
diff -Nur fdutils-5.4.orig/doc/diskseekd.texi fdutils-5.4/doc/diskseekd.texi
--- fdutils-5.4.orig/doc/diskseekd.texi	Sat Mar  1 17:29:47 1997
+++ fdutils-5.4/doc/diskseekd.texi	Thu Aug 22 22:11:43 2002
@@ -1,4 +1,4 @@
-@node diskseekd, fdmount, diskd, Commands
+@node diskseekd, fdmount, fddiskd, Commands
 @section diskseekd
 @pindex diskseekd
 @cindex dust (shaking it off from a drive)
--- fdutils-5.5/doc/Makefile.in.orig	2008-02-09 16:03:41.655696787 +0100
+++ fdutils-5.5/doc/Makefile.in	2008-02-09 16:06:24.444973619 +0100
@@ -18,7 +18,7 @@
 mandir4     = $(mandir)/man4
 mandir8     = $(mandir)/man8
 
-MANPAGES1   =  diskd.1 fdrawcmd.1 getfdprm.1 superformat.1 diskseekd.1 \
+MANPAGES1   =  fdrawcmd.1 getfdprm.1 superformat.1 diskseekd.1 \
                floppycontrol.1 makefloppies.1 xdfcopy.1 fdmount.1 \
                floppymeter.1 setfdprm.1
 
@@ -108,6 +108,7 @@ install-man:
 		install -c -m $(MANPERM) \
 			$(srcdir)/$$i $(DESTDIR)$(mandir1)/$$i; \
 	done
+	install -c -m $(MANPERM) $(srcdir)/diskd.1 $(DESTDIR)$(mandir1)/fddiskd.1
 
 	for i in $(MANPAGES4); do \
 		install -c -m $(MANPERM) \
--- fdutils-5.5/src/Makefile.in.orig	2008-02-09 15:58:25.773695697 +0100
+++ fdutils-5.5/src/Makefile.in	2008-02-09 16:07:22.144261714 +0100
@@ -122,7 +122,7 @@
 install-bin: all
 	$(top_srcdir)/mkinstalldirs $(DESTDIR)$(bindir)
 	$(INSTALL) -c -m $(PERM) $(srcdir)/MAKEFLOPPIES $(DESTDIR)$(bindir)
-	$(INSTALL) -c -m $(PERM) diskd $(DESTDIR)$(bindir)
+	$(INSTALL) -c -m $(PERM) diskd $(DESTDIR)$(bindir)/fddiskd
 	$(INSTALL) -c -m $(PERM) diskseekd $(DESTDIR)$(bindir)
 	$(INSTALL) -c -m $(PERM) floppycontrol $(DESTDIR)$(bindir)
 	$(INSTALL) -c -m $(PERM) floppymeter $(DESTDIR)$(bindir)