summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Eisentraut <petere@debian.org>2013-11-02 17:44:03 -0400
committerJoey Hess <joey@kitenet.net>2013-11-05 22:35:50 -0400
commita4ae7cb030f54132756fd2dc74bbdf47bdbdc134 (patch)
tree9230d9883a5e13b3a88dafa810657959e4161a37
parentf0fb1db1f524d51503ebc757828c7d2f3874cebf (diff)
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.
-rw-r--r--Makefile2
-rw-r--r--debian/control2
-rw-r--r--errno.docbook2
-rw-r--r--ifdata.docbook2
-rw-r--r--ifne.docbook2
-rw-r--r--isutf8.docbook2
-rw-r--r--lckdo.docbook2
-rw-r--r--mispipe.docbook2
-rw-r--r--parallel.docbook2
-rw-r--r--pee.docbook2
-rw-r--r--sponge.docbook2
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 <joeyh@debian.org>
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.,
<refmeta>
<refentrytitle>errno</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">moreutils</refmiscinfo>
+ <refmiscinfo class="source">moreutils</refmiscinfo>
</refmeta>
<refnamediv>
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.,
<refmeta>
<refentrytitle>ifdata</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">moreutils</refmiscinfo>
+ <refmiscinfo class="source">moreutils</refmiscinfo>
</refmeta>
<refnamediv>
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.,
<refmeta>
<refentrytitle>ifne</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">moreutils</refmiscinfo>
+ <refmiscinfo class="source">moreutils</refmiscinfo>
</refmeta>
<refnamediv>
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.,
<refmeta>
<refentrytitle>isutf8</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">moreutils</refmiscinfo>
+ <refmiscinfo class="source">moreutils</refmiscinfo>
</refmeta>
<refnamediv>
diff --git a/lckdo.docbook b/lckdo.docbook
index 3bec67a..3fbf797 100644
--- a/lckdo.docbook
+++ b/lckdo.docbook
@@ -26,6 +26,8 @@ Public domain.
<refmeta>
<refentrytitle>lckdo</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">moreutils</refmiscinfo>
+ <refmiscinfo class="source">moreutils</refmiscinfo>
</refmeta>
<refnamediv>
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.,
<refmeta>
<refentrytitle>mispipe</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">moreutils</refmiscinfo>
+ <refmiscinfo class="source">moreutils</refmiscinfo>
</refmeta>
<refnamediv>
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
<refmeta>
<refentrytitle>parallel</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">moreutils</refmiscinfo>
+ <refmiscinfo class="source">moreutils</refmiscinfo>
</refmeta>
<refnamediv>
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.,
<refmeta>
<refentrytitle>pee</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">moreutils</refmiscinfo>
+ <refmiscinfo class="source">moreutils</refmiscinfo>
</refmeta>
<refnamediv>
diff --git a/sponge.docbook b/sponge.docbook
index 474155e..07a2645 100644
--- a/sponge.docbook
+++ b/sponge.docbook
@@ -37,6 +37,8 @@ USA
<refmeta>
<refentrytitle>sponge</refentrytitle>
<manvolnum>1</manvolnum>
+ <refmiscinfo class="manual">moreutils</refmiscinfo>
+ <refmiscinfo class="source">moreutils</refmiscinfo>
</refmeta>
<refnamediv>