Bug#862561: unblock: debian-reference/2.68

2017-05-14 Thread Osamu Aoki
Hi,

debdiff attached.

> 862561: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=862561
diff -Nru debian-reference-2.67/bin/fuzzypo debian-reference-2.68/bin/fuzzypo
--- debian-reference-2.67/bin/fuzzypo	1970-01-01 09:00:00.0 +0900
+++ debian-reference-2.68/bin/fuzzypo	2017-05-06 23:16:56.0 +0900
@@ -0,0 +1,11 @@
+#! /bin/sh -e
+# vim: set sts=4 expandtab:
+# $1: es.po fr.po pt.po zh-cn.po zh-cn.po-best ...
+#
+DPO="po"
+MSGATTR="msgattrib"
+#
+echo "no-obsolete  $1  `${MSGATTR} --no-obsolete  $1 |grep ^msgid |sed 1d|wc -l`"
+echo "untranslated $1  `${MSGATTR} --untranslated $1 |grep ^msgid |sed 1d|wc -l`"
+echo "fuzzy$1  `${MSGATTR} --fuzzy$1 |grep ^msgid |sed 1d|wc -l`"
+echo
diff -Nru debian-reference-2.67/bin/genxml debian-reference-2.68/bin/genxml
--- debian-reference-2.67/bin/genxml	1970-01-01 09:00:00.0 +0900
+++ debian-reference-2.68/bin/genxml	2017-05-06 23:16:56.0 +0900
@@ -0,0 +1,73 @@
+#! /bin/sh -e
+# vim: set sts=4 expandtab:
+# $1: en fr pt zh-cn ...
+#
+DPO="po"
+DBIN="bin"
+DCC="/usr/share/opencc"
+MANUAL="debian-reference"
+# The threshold should be 80 if translation is completed.
+THRESHOLD="0"
+TRANSLATE="po4a-translate -M utf-8 --format docbook --keep ${THRESHOLD} -v"
+MSGCAT="msgcat"
+OPENCC="opencc"
+
+# Generate XML (en)
+gen_xml_en () {
+echo "!!! Should not be here !!!" >&2
+false
+}
+
+# Generate XML (other)
+gen_xml_other () {
+if [ -f ${DPO}/${1}.add ]; then
+${TRANSLATE} -m ${MANUAL}.en.xml -a ${DPO}/${1}.add -p ${DPO}/${1}.po -l ${MANUAL}.${1}.xml
+else
+${TRANSLATE} -m ${MANUAL}.en.xml -p ${DPO}/${1}.po -l ${MANUAL}.${1}.xml
+fi
+}
+
+# Generate XML (zh-cn)
+gen_xml_zh_CN () {
+if which opencc >/dev/null ; then
+${MSGCAT} --no-wrap ${DPO}/zh-cn.po |\
+${OPENCC} -c ${DCC}/tw2sp.json -o ${DPO}/zh-cn.po-opencc
+${MSGCAT} -o ${DPO}/zh-cn.po-best --use-first ${DPO}/zh-cn.po ${DPO}/zh-cn.po-opencc
+${DBIN}/fuzzypo ${DPO}/zh-cn.po-best >>fuzzy.log
+else
+ln -f ${DPO}/zh-cn.po ${DPO}/zh-cn.po-best
+fi
+if [ -f ${DPO}/zh-cn.add ]; then
+${TRANSLATE} -m ${MANUAL}.en.xml -a ${DPO}/zh-cn.add -p ${DPO}/zh-cn.po-best -l ${MANUAL}.zh-cn.xml
+else
+${TRANSLATE} -m ${MANUAL}.en.xml -p ${DPO}/zh-cn.po-best -l ${MANUAL}.zh-cn.xml
+fi
+#rm -f ${DPO}/zh-cn.po-best
+}
+
+# Generate XML (zh-tw)
+gen_xml_zh_TW () {
+if which opencc >/dev/null ; then
+${MSGCAT} --no-wrap ${DPO}/zh-cn.po |\
+${OPENCC} -c ${DCC}/s2twp.json -o ${DPO}/zh-tw.po-opencc
+${MSGCAT} -o ${DPO}/zh-tw.po-best --use-first ${DPO}/zh-tw.po ${DPO}/zh-tw.po-opencc
+${DBIN}/fuzzypo ${DPO}/zh-tw.po-best >>fuzzy.log
+else
+ln -f ${DPO}/zh-tw.po ${DPO}/zh-tw.po-best
+fi
+if [ -f ${DPO}/zh-tw.add ]; then
+${TRANSLATE} -m ${MANUAL}.en.xml -a ${DPO}/zh-tw.add -p ${DPO}/zh-tw.po-best -l ${MANUAL}.zh-tw.xml
+else
+${TRANSLATE} -m ${MANUAL}.en.xml -p ${DPO}/zh-tw.po-best -l ${MANUAL}.zh-tw.xml
+fi
+#rm -f ${DPO}/zh-tw.po-best
+}
+
+# Main routine
+case "$1" in
+"zh-tw")gen_xml_zh_TW;;
+"zh-cn")gen_xml_zh_CN;;
+"en")   gen_xml_en;;
+*)  gen_xml_other "$1";;
+esac
+
diff -Nru debian-reference-2.67/bin/mkindexhtml debian-reference-2.68/bin/mkindexhtml
--- debian-reference-2.67/bin/mkindexhtml	2014-10-08 23:39:16.0 +0900
+++ debian-reference-2.68/bin/mkindexhtml	2017-05-06 23:16:56.0 +0900
@@ -54,7 +54,7 @@
   echo ", epub"
 fi
 #echo ", PS"
-#echo ", PDF"
+echo ", PDF"
 echo ""
   done
   echo ""
@@ -62,7 +62,7 @@
 fi
 echo "" 
 echo "All files are encoded in UTF-8."
-#echo "HTML (single) file format is provided as substitute for PS/PDF format for full text serach."
+#echo "HTML (single) file format is provided as substitute for PS/PDF format for full text search."
 #echo "All contents are now in version 2 series based on XML source."
 #echo "The old translated contents in German, Spanish, Polish, Portuguese (Brazil), Chinese (Traditional), and Chinese (Simplified) are available as squeeze packages.  "
 echo "If your favorite language is not found in this list, please install the corresponding debian-reference-* package."
diff -Nru debian-reference-2.67/datadatepop.ent debian-reference-2.68/datadatepop.ent
--- debian-reference-2.67/datadatepop.ent	2016-12-05 01:10:07.0 +0900
+++ debian-reference-2.68/datadatepop.ent	2017-05-06 23:16:56.0 +0900
@@ -1 +1 @@
-
+
diff -Nru debian-reference-2.67/datadatesize.ent debian-reference-2.68/datadatesize.ent
--- debian-reference-2.67/datadatesize.ent	2016-12-05 01:09:48.0 +0900
+++ debian-reference-2.68/datadatesize.ent	2017-05-06 23:16:56.0 +0900
@@ -1,5 +1,5 @@
-
-
+
+
 
-
-
+
+
diff -Nru debian-reference-2.67/debian/all.install-in debian-reference-2.68/debian/all.install-in
--- debian-reference-2.67/debian/all.install-in	2014-10-08 

Bug#862561: unblock: debian-reference/2.68

2017-05-14 Thread Osamu Aoki
Package: release.debian.org
Severity: normal
User: release.debian@packages.debian.org
Usertags: unblock

Please unblock package debian-reference

(explain the reason for the unblock here)
* Added PDF (This is also for updating www.debian.org page)
  * Local browser script updated.
* Updated translation
  * Many ES and zh-cn updates.
  * Improved zh-tw translation by making opencc as the back up method 
other than the manual PO updates.

(include/attach the debdiff against the package in testing)
Attached after removing PO

unblock debian-reference/2.68

-- System Information:
Debian Release: 9.0
  APT prefers testing-proposed-updates
  APT policy: (500, 'testing-proposed-updates'), (500, 'testing'), (98, 
'experimental'), (98, 'unstable')
Architecture: amd64
 (x86_64)
Foreign Architectures: i386

Kernel: Linux 4.10.0-rc6-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)


signature.asc
Description: PGP signature