tag 497883 patch thanks On Wed, Nov 05, 2008 at 12:55:36AM +0000, Gerrit Pape wrote: > > On Fri, Sep 05, 2008 at 11:57:19AM +0530, Kartik Mistry wrote: > > Please find simple patch to address this issue. > > Hi, the manpages are generated through asciidoc in the package build > process. A correct patch would include understanding how different > versions of asciidoc + co. handle the same source. I personally didn't > manage this yet, and lost some motivations dealing with that tools in > the meantime.
The core of the bug is in Documentation/manpage-1.72.xml. xmlto -m manpage-1.72.xsl man git-reset.xml gives a buggy git-reset.1 while xmlto -m callouts.xml man git-reset.xml gives a working one. The former is used in the Debian build because it sets DOCBOOK_XSL_172=Yes in debian/rules. The upstream history is at http://git.kernel.org/?p=git/git.git;a=history;f=Documentation/manpage-1.72.xsl and a long description refers to http://thread.gmane.org/gmane.comp.version-control.git/53457/focus=53458 which indicates it's a workaround for a bug in docbook-xsl 1.72. Now, we have 1.73 in lenny and sid, and it indeed has this problem fixed. However, we still apparently need the asciidoc "-a docbook-xsl-172" option to avoid reintroducing #476634. The attached patch seems to work for me. -- Niko Tyni nt...@debian.org
>From d9c2dcaa10dd50b75992fe094f1744f1ae8ccaf2 Mon Sep 17 00:00:00 2001 From: Niko Tyni <nt...@debian.org> Date: Sat, 17 Jan 2009 00:01:05 +0200 Subject: [PATCH] Fix bold text in the manual pages. (Closes: #490863) --- Documentation/Makefile | 3 +++ debian/rules | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-) diff --git a/Documentation/Makefile b/Documentation/Makefile index 62269e3..c1e121f 100644 --- a/Documentation/Makefile +++ b/Documentation/Makefile @@ -63,6 +63,9 @@ ifdef DOCBOOK_XSL_172 ASCIIDOC_EXTRA += -a docbook-xsl-172 MANPAGE_XSL = manpage-1.72.xsl endif +ifdef DOCBOOK_XSL_173 +ASCIIDOC_EXTRA += -a docbook-xsl-172 +endif # # Please note that there is a minor bug in asciidoc. diff --git a/debian/rules b/debian/rules index 7a1e771..15335a6 100755 --- a/debian/rules +++ b/debian/rules @@ -57,7 +57,7 @@ build-arch-stamp: patch-stamp build-indep-stamp CC='$(CC)' CFLAGS='$(CFLAGS)' $(OPTS) touch build-arch-stamp build-indep-stamp: - $(MAKE) -CDocumentation man html ASCIIDOC8=YesPlease DOCBOOK_XSL_172=Yes + $(MAKE) -CDocumentation man html ASCIIDOC8=YesPlease DOCBOOK_XSL_173=Yes touch build-indep-stamp clean: deb-checkdir deb-checkuid -- debian.1.5.6.5.2.1.g6a436
