pull patches back in from 2.20-2 build

diff --git a/debian/patches/diskdefs-directory.diff b/debian/patches/diskdefs-directory.diff
new file mode 100644 (file)
index 0000000..a4add9c
--- /dev/null
+++ b/debian/patches/diskdefs-directory.diff
@@ -0,0 +1,13 @@
+diff --git a/Makefile.in b/Makefile.in
+index 878de76..d42f73a 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -91,7 +91,7 @@ install:     all
+               $(INSTALL) -s -m 755 mkfs.cpm $(BINDIR)/mkfs.cpm
+               $(INSTALL) -s -m 755 fsck.cpm $(BINDIR)/fsck.cpm
+               [ "$(FSED_CPM)" == '' ] || $(INSTALL) -s -m 755 fsed.cpm $(BINDIR)/fsed.cpm
+-              $(INSTALL_DATA) diskdefs @datarootdir@/diskdefs
++              $(INSTALL_DATA) diskdefs $(datarootdir)/diskdefs
+               $(INSTALL_DATA) cpmls.1 $(MANDIR)/man1/cpmls.1
+               $(INSTALL_DATA) cpmcp.1 $(MANDIR)/man1/cpmcp.1
+               $(INSTALL_DATA) cpmrm.1 $(MANDIR)/man1/cpmrm.1

diff --git a/debian/patches/man-page-typos.diff b/debian/patches/man-page-typos.diff
new file mode 100644 (file)
index 0000000..585d495
--- /dev/null
+++ b/debian/patches/man-page-typos.diff
@@ -0,0 +1,134 @@
+diff --git a/fsck.cpm.1.in b/fsck.cpm.1.in
+index b27697e..a183cf8 100644
+--- a/fsck.cpm.1.in
++++ b/fsck.cpm.1.in
+@@ -1,8 +1,8 @@
+ .TH FSCK.CPM 1 "@UPDATED@" "CP/M tools" "User commands"
+-.SH NAME ..\"{{{roff}}}\"{{{
++.SH NAME \"{{{roff}}}\"{{{
+ fsck.cpm \- check a CP/M file system
+ .\"}}}
+-.SH SYNOPSIS .\"{{{
++.SH SYNOPSIS \"{{{
+ .ad l
+ .B fsck.cpm
+ .RB [ \-f
+@@ -11,7 +11,7 @@ fsck.cpm \- check a CP/M file system
+ .I image
+ .ad b
+ .\"}}}
+-.SH DESCRIPTION .\"{{{
++.SH DESCRIPTION \"{{{
+ \fBfsck.cpm\fP is used to check and repair a CP/M file system.  After
+ reading the directory, it makes two passes.  The first pass checks extent
+ fields for range and format violations (bad status, extent number, last
+@@ -22,7 +22,7 @@ invalid time stamp mode).  The second pass checks extent connectivity
+ .P
+ \fBfsck.cpm\fP can not yet repair all errors.
+ .\"}}}
+-.SH OPTIONS .\"{{{
++.SH OPTIONS \"{{{
+ .IP "\fB\-f\fP \fIformat\fP"
+ Use the given CP/M disk \fIformat\fP instead of the default format.
+ .IP "\fB\-T\fP \fIlibdsk-type\fP"
+@@ -31,19 +31,19 @@ libdsk driver type, e.g. \fBtele\fP for Teledisk images or \fBraw\fP for raw ima
+ .IP "\fB\-n\fP"
+ Open the file system read-only and do not repair any errors.
+ .\"}}}
+-.SH "RETURN VALUE" .\"{{{
++.SH "RETURN VALUE" \"{{{
+ Upon successful completion, exit code 0 is returned.
+ .\"}}}
+-.SH ERRORS .\"{{{
++.SH ERRORS \"{{{
+ Any errors are indicated by exit code 1.
+ .\"}}}
+-.SH FILES .\"{{{
++.SH FILES \"{{{
+ @DATADIR@/diskdefs    CP/M disk format definitions
+ .\"}}}
+ .SH ENVIRONMENT \"{{{
+ CPMTOOLSFMT     Default format
+ .\"}}}
+-.SH DIAGNOSTICS .\"{{{
++.SH DIAGNOSTICS \"{{{
+ .IP "\fIimage\fP: \fIused\fP/\fItotal\fP files (\fIn\fP.\fIn\fP% non-contiguos), \fIused\fP/\fItotal\fP blocks"
+ No inconsistencies could be found.  The number of used files actually
+ is the number of used extents.  Since a file may use more than
+@@ -54,7 +54,7 @@ pointed to by the same extent do not have sequential block numbers.
+ The number of used blocks includes the blocks used for system tracks
+ and the directory.
+ .\"}}}
+-.SH AUTHORS .\"{{{
++.SH AUTHORS \"{{{
+ This program is copyright 1997\(en2012 Michael Haardt
+ <michael@moria.de>.  The Windows port is copyright 2000, 2001, 2011 John Elliott
+ <jce@seasip.demon.co.uk>.
+@@ -73,7 +73,7 @@ You should have received a copy of the GNU General Public License along
+ with this program.  If not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ .\"}}}
+-.SH "SEE ALSO" .\"{{{
++.SH "SEE ALSO" \"{{{
+ .IR fsck (8),
+ .IR mkfs.cpm (1),
+ .IR cpm (5)
+diff --git a/fsed.cpm.1.in b/fsed.cpm.1.in
+index 1520be2..6c9fde7 100644
+--- a/fsed.cpm.1.in
++++ b/fsed.cpm.1.in
+@@ -1,8 +1,8 @@
+ .TH FSED.CPM 1 "@UPDATED@" "CP/M tools" "User commands"
+-.SH NAME ..\"{{{roff}}}\"{{{
++.SH NAME \"{{{roff}}}\"{{{
+ fsed.cpm \- edit a CP/M file system
+ .\"}}}
+-.SH SYNOPSIS .\"{{{
++.SH SYNOPSIS \"{{{
+ .ad l
+ .B fsed.cpm
+ .RB [ \-f
+@@ -10,29 +10,29 @@ fsed.cpm \- edit a CP/M file system
+ .I image
+ .ad b
+ .\"}}}
+-.SH DESCRIPTION .\"{{{
++.SH DESCRIPTION \"{{{
+ \fBfsed.cpm\fP edits a CP/M file system on an image file or device.
+ It knows about the system, directory and data area, using sector skew on
+ the last two.  Directory entries are decoded.  The interactive usage is
+ self-explanatory.
+ .\"}}}
+-.SH OPTIONS .\"{{{
++.SH OPTIONS \"{{{
+ .IP "\fB\-f\fP \fIformat\fP"
+ Use the given CP/M disk \fIformat\fP instead of the default format.
+ .IP "\fB\-T\fP \fIlibdsk-type\fP"
+ libdsk driver type, e.g. \fBtele\fP for Teledisk images or \fBraw\fP for raw images 
+ (requires building cpmtools with support for libdsk).
+ .\"}}}
+-.SH "RETURN VALUE" .\"{{{
++.SH "RETURN VALUE" \"{{{
+ Upon successful completion, exit code 0 is returned.
+ .\"}}}
+-.SH ERRORS .\"{{{
++.SH ERRORS \"{{{
+ Any errors are indicated by exit code 1.
+ .\"}}}
+ .SH ENVIRONMENT \"{{{
+ CPMTOOLSFMT     Default format
+ .\"}}}
+-.SH FILES .\"{{{
++.SH FILES \"{{{
+ @DATADIR@/diskdefs    CP/M disk format definitions
+ .\"}}}
+ .SH AUTHORS \"{{{
+@@ -54,7 +54,7 @@ You should have received a copy of the GNU General Public License along
+ with this program.  If not, write to the Free Software Foundation, Inc.,
+ 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ .\"}}}
+-.SH "SEE ALSO" .\"{{{
++.SH "SEE ALSO" \"{{{
+ .IR fsck.cpm (1),
+ .IR mkfs.cpm (1),
+ .IR cpmls (1),

diff --git a/debian/patches/series b/debian/patches/series
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..e48afc163c840576bcdc6ac17c00b0b17d67d432 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+diskdefs-directory.diff
+man-page-typos.diff