switch to dh'ified rules file, drop man page typos patch

diff --git a/debian/patches/man-page-typos.diff b/debian/patches/man-page-typos.diff
deleted file mode 100644 (file)
index 585d495..0000000
--- a/debian/patches/man-page-typos.diff
+++ /dev/null
@@ -1,134 +0,0 @@
-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/rules b/debian/rules
index 6b1fe22270e6b0074a23c918d0154957dd9663b2..2d33f6ac8992b7da84b39a5bca0742c4962d3349 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,64 +1,4 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-configure: configure-stamp
-configure-stamp:
-       dh_testdir
-       cp /usr/share/misc/config.sub config.sub
-       cp /usr/share/misc/config.guess config.guess
-       ./configure --prefix=/usr --mandir=\$${prefix}/share/man \
-               --datarootdir=/etc/cpmtools
-       touch configure-stamp
-
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: configure-stamp
-       dh_testdir
-       $(MAKE)
-       touch build-stamp
-
-clean:
-       dh_testdir
-       dh_testroot
-       rm -f build-stamp configure-stamp
-       [ ! -f Makefile ] || $(MAKE) distclean
-       dh_clean
-
-install: build
-       dh_testdir
-       dh_testroot
-       dh_prep
-       dh_installdirs
-       $(MAKE) DESTDIR=$(CURDIR)/debian/cpmtools install \
-               prefix=$(CURDIR)/debian/cpmtools/usr \
-               datarootdir=$(CURDIR)/debian/cpmtools/etc/cpmtools
-
-# Build architecture-independent files here.
-binary-indep: build install
-
-# Build architecture-dependent files here.
-binary-arch: build install
-       dh_testdir
-       dh_testroot
-       dh_installdocs
-       dh_installexamples
-       dh_installmenu
-       dh_installcron
-       dh_installman
-       dh_installinfo
-       dh_installchangelogs 
-       dh_link
-       dh_strip
-       dh_compress
-       dh_fixperms
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+%:
+       dh $@