2019-05-15 12:24:30 +02:00
|
|
|
From 5264df9284461edb4ae2309ad72acf7c3d8161e9 Mon Sep 17 00:00:00 2001
|
|
|
|
|
From: Dominique Leuenberger <dimstar@opensuse.org>
|
|
|
|
|
Date: Wed, 8 May 2019 19:00:47 +0200
|
|
|
|
|
Subject: [PATCH] DOC: Move to DocBook 5 when using asciidoctor
|
|
|
|
|
|
|
|
|
|
DocBook 5 has been released about a decade ago. Newer versions of
|
|
|
|
|
asciidoctor (since version 2.x) no longer support DocBook 4.5, it
|
|
|
|
|
is thus time for us to move to newer support as well.
|
|
|
|
|
---
|
|
|
|
|
Documentation/Makefile | 4 ++--
|
|
|
|
|
contrib/subtree/Makefile | 5 +++--
|
|
|
|
|
2 files changed, 5 insertions(+), 4 deletions(-)
|
|
|
|
|
|
2019-11-08 15:21:58 +01:00
|
|
|
Index: git-2.24.0/contrib/subtree/Makefile
|
|
|
|
|
===================================================================
|
|
|
|
|
--- git-2.24.0.orig/contrib/subtree/Makefile
|
|
|
|
|
+++ git-2.24.0/contrib/subtree/Makefile
|
2019-05-15 12:24:30 +02:00
|
|
|
@@ -25,12 +25,13 @@ ASCIIDOC_HTML = xhtml11
|
|
|
|
|
ASCIIDOC_DOCBOOK = docbook
|
|
|
|
|
ASCIIDOC_EXTRA =
|
|
|
|
|
XMLTO = xmlto
|
|
|
|
|
+XMLTO_EXTRA = --skip-validation
|
|
|
|
|
|
|
|
|
|
ifdef USE_ASCIIDOCTOR
|
|
|
|
|
ASCIIDOC = asciidoctor
|
|
|
|
|
ASCIIDOC_CONF =
|
|
|
|
|
ASCIIDOC_HTML = xhtml5
|
|
|
|
|
-ASCIIDOC_DOCBOOK = docbook45
|
|
|
|
|
+ASCIIDOC_DOCBOOK = docbook5
|
|
|
|
|
ASCIIDOC_EXTRA += -I../../Documentation -rasciidoctor-extensions
|
|
|
|
|
ASCIIDOC_EXTRA += -alitdd='&\#x2d;&\#x2d;'
|
|
|
|
|
endif
|
|
|
|
|
@@ -78,7 +79,7 @@ install-html: $(GIT_SUBTREE_HTML)
|
|
|
|
|
$(INSTALL) -m 644 $^ $(DESTDIR)$(htmldir)
|
|
|
|
|
|
|
|
|
|
$(GIT_SUBTREE_DOC): $(GIT_SUBTREE_XML)
|
|
|
|
|
- $(XMLTO) -m $(MANPAGE_XSL) man $^
|
|
|
|
|
+ $(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $^
|
|
|
|
|
|
|
|
|
|
$(GIT_SUBTREE_XML): $(GIT_SUBTREE_TXT)
|
|
|
|
|
$(ASCIIDOC) -b $(ASCIIDOC_DOCBOOK) -d manpage $(ASCIIDOC_CONF) \
|
