From 05ccc2a5b201a76c0a76e9910abb7b3229e7b079 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Thu, 3 Jul 2014 01:56:52 +0200
Subject: build: Set the XSL parameter through the command line instead of sed

Use the xsltproc --stringparam option instead of replacing it inside the
file.
---
 buildlib/po4a_manpage.mak | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'buildlib/po4a_manpage.mak')

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index b3d586b2f..62ada1969 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -35,12 +35,13 @@ apt-vendor.ent: ../apt-vendor.ent
 	cp -a ../apt-vendor.ent .
 
 manpage-style.xsl: ../manpage-style.xsl
-	sed "/<!-- LANGUAGE -->/ i\
-<xsl:param name=\"l10n.gentext.default.language\" select=\"'$(LC)'\" />" ../manpage-style.xsl > manpage-style.xsl
+	cp -a $< .
 
 $($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES)
 	echo Creating man page $@
-	$(XSLTPROC) -o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here???
+	$(XSLTPROC) \
+		--stringparam l10n.gentext.default.language $(LC) \
+		-o $@ $(STYLESHEET) $< || exit 200 # why xsltproc doesn't respect the -o flag here???
 	test -f $(subst .$(LC),,$@) || echo 'FIXME: xsltproc respects the -o flag now, workaround can be removed'
 	mv -f $(subst .$(LC),,$@) $@
 
-- 
cgit v1.2.3


From a034d8528bc98e9caf12e024a0d5eeb25f87a500 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Wed, 2 Jul 2014 04:10:37 +0200
Subject: build: Convert from DebianDoc SGML to DocBook XML

---
 buildlib/po4a_manpage.mak | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

(limited to 'buildlib/po4a_manpage.mak')

diff --git a/buildlib/po4a_manpage.mak b/buildlib/po4a_manpage.mak
index 62ada1969..0f53a8600 100644
--- a/buildlib/po4a_manpage.mak
+++ b/buildlib/po4a_manpage.mak
@@ -15,6 +15,9 @@ INCLUDES = apt.ent apt-verbatim.ent apt-vendor.ent
 
 manpages:
 
+%.xsl: ../%.xsl
+	cp -a $< .
+
 # Do not use XMLTO, build the manpages directly with XSLTPROC
 ifdef XSLTPROC
 
@@ -34,9 +37,6 @@ apt-verbatim.ent: ../apt-verbatim.ent
 apt-vendor.ent: ../apt-vendor.ent
 	cp -a ../apt-vendor.ent .
 
-manpage-style.xsl: ../manpage-style.xsl
-	cp -a $< .
-
 $($(LOCAL)-LIST) :: % : %.xml $(STYLESHEET) $(INCLUDES)
 	echo Creating man page $@
 	$(XSLTPROC) \
@@ -70,7 +70,6 @@ ifneq ($(words $(SOURCE)),0)
 include $(MANPAGE_H)
 endif
 
-# Debian Doc SGML Documents
-SOURCE := $(wildcard *.$(LC).sgml)
-DEBIANDOC_HTML_OPTIONS=-l $(LC).UTF-8
-include $(DEBIANDOC_H)
+# DocBook XML Documents
+SOURCE := $(wildcard *.$(LC).dbk)
+include $(DOCBOOK_H)
-- 
cgit v1.2.3