[debian-edu-commits] debian-edu/ 02/02: Improve (ja) HTML manual date rendering. Adjust Makefile.common, copyright.packaging and changelog.

[Wolfgang Schweer]

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

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

commit 7f951615b20973299fc128783311fffc5ec1c92f
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Thu Jul 21 14:04:05 2016 +0200

    Improve (ja) HTML manual date rendering. Adjust Makefile.common, copyright.packaging and changelog.
---
 debian/changelog                     | 4 +++-
 debian/copyright                     | 4 ++++
 debian/copyright.packaging           | 4 ++++
 documentation/common/Makefile.common | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 108b6a8..8cee9a5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,9 +13,11 @@ debian-edu-doc (1.903~20160710) UNRELEASED; urgency=medium
       correctly. Thanks to Victory.
   * dblatex.xsl: use sans serif fonts for non-japanese text.
   * 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 to avoid lintian warning.
+  * Add copyright information for common/dblatex.xsl and common/sed-ja.txt.
   * Update debian/copyright using the Makefile update-copyright target.
 
   [ Stretch Manual translation updates ]
diff --git a/debian/copyright b/debian/copyright
index 9da8108..391671b 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -46,6 +46,10 @@ 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/debian/copyright.packaging b/debian/copyright.packaging
index 5dc41ce..95a4b0d 100644
--- a/debian/copyright.packaging
+++ b/debian/copyright.packaging
@@ -46,6 +46,10 @@ 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 8aa2405..860d03e 100644
--- a/documentation/common/Makefile.common
+++ b/documentation/common/Makefile.common
@@ -77,7 +77,7 @@ build-html:
 	msgcat -o $(name).$(LINGUA).po $(name).$(LINGUA).po
 	# build the HTML file
 	if [ "$(LINGUA)" = "ja" ] ; then \
-	    sed -i s/dbtimestamp/dbtimestamp\ format=\"Y-m-d\"/ $(name).$(LINGUA).xml ; \
+	    sed -i -f ../common/sed-ja.txt $(name).$(LINGUA).xml ; \
 	fi ; \
 	$(XP) $(name).$(LINGUA).xml && mv index.html $(name).$(LINGUA).html
 	# restore internal links

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