diff options
-rw-r--r-- | buildlib/po4a_manpage.mak | 2 | ||||
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | doc/makefile | 2 | ||||
-rw-r--r-- | doc/manpage-style.xsl | 1 |
4 files changed, 7 insertions, 1 deletions
diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak index 404bb57a5..5814180d8 100644 --- a/buildlib/po4a_manpage.mak +++ b/buildlib/po4a_manpage.mak @@ -16,7 +16,7 @@ INCLUDES = apt.ent apt-verbatim.ent # Do not use XMLTO, build the manpages directly with XSLTPROC ifdef XSLTPROC -STYLESHEET=../manpage-style.xsl +STYLESHEET=manpage-style.xsl LOCAL := po4a-manpage-$(firstword $(SOURCE)) $(LOCAL)-LIST := $(SOURCE) diff --git a/debian/changelog b/debian/changelog index bcc29eb86..b6464388d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,6 +28,9 @@ apt (0.9.4) UNRELEASED; urgency=low * cmdline/apt-get.cc: - use the host architecture, not the build architecture for matching of [architecture restrictions] in Build-Depends (Closes: #672927) + * doc/makefile: + - build manpages with the correct l10n.gentext.default.language setting + to get the correct section titles provided by docbook [ Raphael Geissert ] * apt-pkg/acquire*.cc: diff --git a/doc/makefile b/doc/makefile index f52586935..76e29e2b9 100644 --- a/doc/makefile +++ b/doc/makefile @@ -42,6 +42,8 @@ dirs-manpage-subdirs: for i in $(MANPAGEPO); do \ test -d $$i || mkdir $$i; \ test -f $$i/makefile || sed "s#@@LANG@@#$$i#" lang.makefile > $$i/makefile; \ + test -f $$i/manpage-style.xsl || sed "/<!-- LANGUAGE -->/ i\ +<xsl:param name=\"l10n.gentext.default.language\" select=\"'$$i'\" />" manpage-style.xsl > $$i/manpage-style.xsl; \ done # Clean rule diff --git a/doc/manpage-style.xsl b/doc/manpage-style.xsl index 85aa4521f..ef349f064 100644 --- a/doc/manpage-style.xsl +++ b/doc/manpage-style.xsl @@ -5,6 +5,7 @@ <xsl:import href="/usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl" /> <xsl:param name="man.output.encoding" select="'UTF-8'" /> +<!-- LANGUAGE --> <xsl:template match="email"><<xsl:apply-templates/>></xsl:template> |