Package: git-core Version: 1.6.3.1-1 Tags: patch The fix for manpage formatting problems was broken by an upstream change to the Documentation/Makefile options between 1.6.2.1 and 1.6.3:
http://git.kernel.org/?p=git/git.git;a=commitdiff;h=8fa2b45f3a70a1622c8fc5d35af148da5cab80d1 As an example of the brokenness, the documentation for --amend in git-commit(1) contains a spurious “.ft C” and “.ft”. This patch should fix it (tested on lenny and karmic): --- git-core-1.6.3.1/debian/changelog +++ git-core-1.6.3.1/debian/changelog @@ -1,3 +1,11 @@ +git-core (1:1.6.3.1-2) UNRELEASED; urgency=low + + * Fix manpage formatting: set ASCIIDOC_NO_ROFF instead of + DOCBOOK_XSL_173 (based on the instructions in Documentation/Makefile) + and don’t override the internal Makefile variable ASCIIDOC_EXTRA. + + -- Anders Kaseorg <ande...@mit.edu> Tue, 26 May 2009 22:15:02 -0400 + git-core (1:1.6.3.1-1) unstable; urgency=low * new upstream point release. --- git-core-1.6.3.1/debian/rules +++ git-core-1.6.3.1/debian/rules @@ -58,8 +58,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_173=Yes \ - ASCIIDOC_EXTRA='-a asciidoc7compatible -a docbook-xsl-172' + $(MAKE) -CDocumentation man html ASCIIDOC8=YesPlease ASCIIDOC_NO_ROFF=Yes touch build-indep-stamp clean: deb-checkdir deb-checkuid -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
