[debian-edu-commits] debian-edu/ 01/01: Makefile.common: use sed regex (inline) provided by Victory to improve date rendering for the Japanese HTML manual.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-doc.

commit 7fb7e4e52c0391b598c498fef2b06b6731bdb495
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Aug 3 15:33:01 2016 +0200

    Makefile.common: use sed regex (inline) provided by Victory to improve date rendering for the Japanese HTML manual.
---
 debian/changelog                     | 8 +++++---
 debian/copyright.packaging           | 4 ----
 documentation/common/Makefile.common | 5 +++--
 documentation/common/sed-ja.txt      | 1 -
 4 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7752844..3dc6c41 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,13 +14,15 @@ debian-edu-doc (1.903~20160710) UNRELEASED; urgency=medium
     - use db2latex style to drop the second (useless) page of PDF manuals.
   * dblatex.xsl: use serif fonts for PDF manuals.
   * edu.css.xml: use sans serif fonts for HTML manuals. Thanks to Victory.
-  * Add common/sed-ja.txt provided by Victory to improve date rendering for
-    the Japanese HTML manual.
   * Add fonts-lmodern to build-depends.
   * Adjust scripts/get_copyright: remove (zh), add (ja).
-  * Add copyright information for common/dblatex.xsl and common/sed-ja.txt.
+  * Add copyright information for common/dblatex.xsl.
   * Update debian/copyright using the Makefile update-copyright target.
 
+  [ Holger Levsen ]
+  * Makefile.common: use sed regex provided by Victory to improve date
+    rendering for the Japanese HTML manual.
+
   [ Stretch Manual translation updates ]
   * Japanese: Victory.
   * Dutch: Frans Spiesschaert.
diff --git a/debian/copyright.packaging b/debian/copyright.packaging
index 95a4b0d..5dc41ce 100644
--- a/debian/copyright.packaging
+++ b/debian/copyright.packaging
@@ -46,10 +46,6 @@ Copyright: 2016 Victory
   2016 Wolfgang Schweer <wschweer at arcor.de>
 License: GPL-2+
 
-Files: documentation/common/sed-ja.txt
-Copyright: 2016 Victory
-License: GPL-2+
-
 Files: debian/*
 Copyright:  2006-2016 Holger Levsen <holger at debian.org>
   2004-2007 Mari Wang <mariwan at ifi.uio.no> 
diff --git a/documentation/common/Makefile.common b/documentation/common/Makefile.common
index a8259d4..5b1ac8e 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -8,6 +8,7 @@ LANGUAGES = `find . -name "$(name).*.po" | sed -e "s/.\/$(name).//" -e "s/.po//"
 DBTOEPUB = dbtoepub
 XP = xsltproc --nonet --novalid --xinclude ../common/html.xsl
 DBLATEX = dblatex -T db2latex -b xetex -p ../common/dblatex.xsl
+SED_JA_REGEX = 's/dbtimestamp/dbtimestamp\ format=\"Y\ 年\ m\ 月\ d\ 日\"/'
 
 # that's ugly, smarter approach appreciated
 directory = `echo $(name) | sed 's/-manual//'`
@@ -49,7 +50,7 @@ build-html:
 	-for f in $(LANGUAGES) ; do \
 		echo "Creating HTML for $$f"; \
 		if [ "$$f" = "ja" ] ; then \
-		    sed -i -f ../common/sed-ja.txt $(name).$$f.xml ; \
+		    sed -i $(SED_JA_REGEX) $(name).$$f.xml ; \
 		fi ; \
 		$(XP) $(name).$$f.xml && mv index.html $(name).$$f.html ; \
 		sed -i "s/href=\"index.html/href=\"$(name).$$f.html/g" $(name).$$f.html ; \
@@ -80,7 +81,7 @@ build-html:
 	msgcat -o $(name).$(LINGUA).po $(name).$(LINGUA).po
 	# build the HTML file
 	if [ "$(LINGUA)" = "ja" ] ; then \
-	    sed -i -f ../common/sed-ja.txt $(name).$(LINGUA).xml ; \
+	    sed -i $(SED_JA_REGEX) $(name).$(LINGUA).xml ; \
 	fi ; \
 	$(XP) $(name).$(LINGUA).xml && mv index.html $(name).$(LINGUA).html
 	# restore internal links
diff --git a/documentation/common/sed-ja.txt b/documentation/common/sed-ja.txt
deleted file mode 100644
index 13ef599..0000000
--- a/documentation/common/sed-ja.txt
+++ /dev/null
@@ -1 +0,0 @@
-s/dbtimestamp/dbtimestamp\ format=\"Y\ 年\ m\ 月\ d\ 日\"/

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-doc.git