From a4ae7cb030f54132756fd2dc74bbdf47bdbdc134 Mon Sep 17 00:00:00 2001 From: Peter Eisentraut Date: Sat, 2 Nov 2013 17:44:03 -0400 Subject: Use docbook-xsl to build man pages Use the style sheets from docbook-xsl to build man pages from DocBook, instead of the obsolete docbook2x package. Adjust Debian build dependencies accordingly. Add some man page metadata required by the new tool chain to the sources. --- Makefile | 2 +- debian/control | 2 +- errno.docbook | 2 ++ ifdata.docbook | 2 ++ ifne.docbook | 2 ++ isutf8.docbook | 2 ++ lckdo.docbook | 2 ++ mispipe.docbook | 2 ++ parallel.docbook | 2 ++ pee.docbook | 2 ++ sponge.docbook | 2 ++ 11 files changed, 20 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 4272d93..4f8af10 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ CFLAGS?=-O2 -g -Wall INSTALL_BIN?=install -s PREFIX?=/usr -DOCBOOK2XMAN=docbook2x-man +DOCBOOK2XMAN=xsltproc --param man.authors.section.enabled 0 /usr/share/xml/docbook/stylesheet/docbook-xsl/manpages/docbook.xsl all: $(BINS) $(MANS) diff --git a/debian/control b/debian/control index bf34038..68cdd5d 100644 --- a/debian/control +++ b/debian/control @@ -1,7 +1,7 @@ Source: moreutils Section: utils Priority: optional -Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), docbook2x, docbook-xml, libxml2-utils +Build-Depends: debhelper (>= 7), dpkg-dev (>= 1.9.0), docbook-xml, docbook-xsl, libxml2-utils, xsltproc Maintainer: Joey Hess Standards-Version: 3.9.2 Vcs-Git: git://git.kitenet.net/moreutils diff --git a/errno.docbook b/errno.docbook index 49370ec..e045f7e 100644 --- a/errno.docbook +++ b/errno.docbook @@ -39,6 +39,8 @@ with this program; if not, write to the Free Software Foundation, Inc., errno 1 + moreutils + moreutils diff --git a/ifdata.docbook b/ifdata.docbook index a57680b..47f4143 100644 --- a/ifdata.docbook +++ b/ifdata.docbook @@ -37,6 +37,8 @@ with this program; if not, write to the Free Software Foundation, Inc., ifdata 1 + moreutils + moreutils diff --git a/ifne.docbook b/ifne.docbook index 0a8c01c..e9c4569 100644 --- a/ifne.docbook +++ b/ifne.docbook @@ -39,6 +39,8 @@ with this program; if not, write to the Free Software Foundation, Inc., ifne 1 + moreutils + moreutils diff --git a/isutf8.docbook b/isutf8.docbook index 33bd3ac..f0d0dbe 100644 --- a/isutf8.docbook +++ b/isutf8.docbook @@ -39,6 +39,8 @@ with this program; if not, write to the Free Software Foundation, Inc., isutf8 1 + moreutils + moreutils diff --git a/lckdo.docbook b/lckdo.docbook index 3bec67a..3fbf797 100644 --- a/lckdo.docbook +++ b/lckdo.docbook @@ -26,6 +26,8 @@ Public domain. lckdo 1 + moreutils + moreutils diff --git a/mispipe.docbook b/mispipe.docbook index 6d0d758..cc966c8 100644 --- a/mispipe.docbook +++ b/mispipe.docbook @@ -39,6 +39,8 @@ with this program; if not, write to the Free Software Foundation, Inc., mispipe 1 + moreutils + moreutils diff --git a/parallel.docbook b/parallel.docbook index b5d438d..bd490e2 100644 --- a/parallel.docbook +++ b/parallel.docbook @@ -25,6 +25,8 @@ Written by Joey Hess parallel 1 + moreutils + moreutils diff --git a/pee.docbook b/pee.docbook index 850b9bd..239f17f 100644 --- a/pee.docbook +++ b/pee.docbook @@ -39,6 +39,8 @@ with this program; if not, write to the Free Software Foundation, Inc., pee 1 + moreutils + moreutils diff --git a/sponge.docbook b/sponge.docbook index 474155e..07a2645 100644 --- a/sponge.docbook +++ b/sponge.docbook @@ -37,6 +37,8 @@ USA sponge 1 + moreutils + moreutils -- cgit v1.2.3