Package: release.debian.org Severity: normal User: [email protected] Usertags: unblock
Please unblock package harden-doc TL;DR: It's just a (French) translation update of this documentation. Long explanation, in case you look at the actual debdiff and run awaw screaming while looking at the crazy diffstat pretending: 234 files changed, 54193 insertions(+), 166541 deletions(-) 227 of those files were actually deleted (166525 deletions), those were some .svn directories and other unused and useless files, including translations that are not build for the package. 2 of those files are the new POT and PO (54150 insertions), that finally allow this documentation to be kept up to date, at least in French as a start. The filtered debdiff attached show you the rest (build process adapted to handle translations from PO files), that works fine (as in tested to build the doc in www-master.d.o for quite some time already). Thanks in advance. Regards David unblock harden-doc/3.15.1 -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.2.0-3-amd64 (SMP w/1 CPU core) Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash
diffstat for harden-doc-3.15 harden-doc-3.15.1 debian/changelog | 8 ++++++++ debian/control | 2 +- howto-source/Makefile | 35 +++++++++++++++++++++++------------ howto-source/README.translators | 7 ++++--- howto-source/po4a/po4a.cfg | 7 +++++++ 5 files changed, 43 insertions(+), 16 deletions(-) diff -Nru --exclude checkout --exclude fixinfo --exclude .cvsignore --exclude '*.po' --exclude '*.pot' --exclude '.svn**' --exclude 'es**' --exclude 'COMO-Asegurar-Debian.*' --exclude 'bin**' --exclude 'it**' --exclude 'pt-br**' --exclude 'ru**' --exclude 'zh-cn**' --exclude 'fr**' --exclude 'ja**' harden-doc-3.15/debian/changelog harden-doc-3.15.1/debian/changelog --- harden-doc-3.15/debian/changelog 2012-03-26 17:41:32.000000000 -0400 +++ harden-doc-3.15.1/debian/changelog 2012-08-23 11:04:45.000000000 -0400 @@ -1,3 +1,11 @@ +harden-doc (3.15.1) unstable; urgency=low + + * Team upload. + * Allow po4a to handle translations. (Closes: #666786) + * Update French translation via PO file. + + -- David Prévot <[email protected]> Thu, 23 Aug 2012 11:04:36 -0400 + harden-doc (3.15) unstable; urgency=low * Update the package with the latest sources diff -Nru --exclude checkout --exclude fixinfo --exclude .cvsignore --exclude '*.po' --exclude '*.pot' --exclude '.svn**' --exclude 'es**' --exclude 'COMO-Asegurar-Debian.*' --exclude 'bin**' --exclude 'it**' --exclude 'pt-br**' --exclude 'ru**' --exclude 'zh-cn**' --exclude 'fr**' --exclude 'ja**' harden-doc-3.15/debian/control harden-doc-3.15.1/debian/control --- harden-doc-3.15/debian/control 2010-08-30 00:53:03.000000000 -0400 +++ harden-doc-3.15.1/debian/control 2012-08-23 10:42:14.000000000 -0400 @@ -2,7 +2,7 @@ Section: doc Priority: extra Maintainer: Javier Fernandez-Sanguino Pen~a <[email protected]> -Build-Depends-Indep: debhelper (>> 3.0.0), dpsyco-devel, debiandoc-sgml (>=1.1.86), perl, texinfo, texlive, texlive-latex-extra, ghostscript +Build-Depends-Indep: debhelper (>> 3.0.0), dpsyco-devel, debiandoc-sgml (>=1.1.86), perl, texinfo, texlive, texlive-latex-extra, ghostscript, po4a Standards-Version: 3.5.8 Homepage: http://www.debian.org/doc/manuals/securing-debian-howto/ Vcs-Svn: svn://svn.debian.org/svn/ddp/manuals/trunk/securing-howto/ diff -Nru --exclude checkout --exclude fixinfo --exclude .cvsignore --exclude '*.po' --exclude '*.pot' --exclude '.svn**' --exclude 'es**' --exclude 'COMO-Asegurar-Debian.*' --exclude 'bin**' --exclude 'it**' --exclude 'pt-br**' --exclude 'ru**' --exclude 'zh-cn**' --exclude 'fr**' --exclude 'ja**' harden-doc-3.15/howto-source/Makefile harden-doc-3.15.1/howto-source/Makefile --- harden-doc-3.15/howto-source/Makefile 2012-03-26 17:20:12.000000000 -0400 +++ harden-doc-3.15.1/howto-source/Makefile 2012-04-07 17:44:32.000000000 -0400 @@ -39,13 +39,12 @@ # This can and will be overridden by a higher level makefile PUBLISHDIR := ~/public_html/manuals.html -# List of languages built for "distclean" target for DDP: -LANGSALL := en de fr es it ru ja zh-cn it +# List of languages not being handled with po4a: +LANGSNOPO := en de es it pt-br ru ja zh-cn +# List of languages handled with po4a: +LANGSPO := fr # List of languages built for "publish" target for DDP -LANGS := en de fr pt-br it -# This are all the languages, not all are compiled for DDP -# due to them being out of dte -#LANGS := en de fr es it ru ja zh-cn pt-br +LANGS := en de fr pt-br # Files which affect SGML generation (excluding *.sgml) SGMLENTS := custom.ent default.ent @@ -55,6 +54,12 @@ $(foreach lang, $(LANGS), $(wildcard $(lang)/*.sgml ) ) \ $(SGMLENTS) +# All SGML targets not being handled with po4a: +SGMLNOPOSRCS := $(foreach lang, $(LANGSNOPO), $(MANUAL).$(lang).sgml) + +# All SGML targets handled with po4a: +SGMLPOSRCS := $(foreach lang, $(LANGSPO), $(MANUAL).$(lang).sgml) + # =================================================================== # # Build target default part: Routine # # =================================================================== # @@ -64,7 +69,8 @@ $(MANUAL).%.html.stamp $(MANUAL).%.txt $(MANUAL).%.ps $(MANUAL).%.pdf: \ locale=$(subst pt-br,pt_BR,\ $(subst zh-cn,zh_CN,\ - $*)) + $(subst fr,fr.UTF-8,\ + $*))) ### Full guide @@ -114,15 +120,20 @@ # Create starting SGML for each language from the template. Actual # contents reside in language-segregated subdirectories. -$(MANUAL).%.sgml: $(MANUAL0).sgml +$(SGMLNOPOSRCS): $(MANUAL).%.sgml: $(MANUAL0).sgml sed -e "s/@@LANGS@@/$*/g" \ -e "s/@@DIRS@@/$*/g" \ -e "s/@@NAME@@/$(MANUAL)/g" \ $< > $(MANUAL).$*.sgml +# Create starting SGML for each language handled with po4a + +$(SGMLPOSRCS): $(MANUAL).%.sgml: $(MANUAL).en.sgml $(MANUAL).en.ent po4a/po/%.po + po4a po4a/po4a.cfg + # HTML $(MANUAL).%.html.stamp: $(MANUAL).%.sgml $(MANUAL).%.ent $(SGMLSRCS) - debiandoc2html -l $(locale) -c $< + debiandoc2html -l $(locale) -C $< # since $(MANUAL).%.html/index.%.html cannot be a target file @for file in `ls $(MANUAL).$*.html/*` ; do \ newfile=`echo $$file|\ @@ -139,18 +150,18 @@ # TXT $(MANUAL).%.txt: $(MANUAL).%.sgml $(MANUAL).%.ent $(SGMLSRCS) - debiandoc2text $(DEBIANDOC2TEXT_FLAGS) -l $(locale) $< + debiandoc2text -l $(locale) $< # PS $(MANUAL).%.ps: $(MANUAL).%.sgml $(MANUAL).%.ent $(SGMLSRCS) - debiandoc2latexps $(DEBIANDOC2LATEXPS_FLAGS) -l $(locale) $< + debiandoc2latexps -l $(locale) $< # PDF $(MANUAL).%.pdf: $(MANUAL).%.sgml $(MANUAL).%.ent $(SGMLSRCS) - debiandoc2latexpdf $(DEBIANDOC2LATEXPDF_FLAGS) -l $(locale) $< + debiandoc2latexpdf -l $(locale) $< # DVI diff -Nru --exclude checkout --exclude fixinfo --exclude .cvsignore --exclude '*.po' --exclude '*.pot' --exclude '.svn**' --exclude 'es**' --exclude 'COMO-Asegurar-Debian.*' --exclude 'bin**' --exclude 'it**' --exclude 'pt-br**' --exclude 'ru**' --exclude 'zh-cn**' --exclude 'fr**' --exclude 'ja**' harden-doc-3.15/howto-source/po4a/po4a.cfg harden-doc-3.15.1/howto-source/po4a/po4a.cfg --- harden-doc-3.15/howto-source/po4a/po4a.cfg 1969-12-31 20:00:00.000000000 -0400 +++ harden-doc-3.15.1/howto-source/po4a/po4a.cfg 2012-04-07 17:44:32.000000000 -0400 @@ -0,0 +1,7 @@ +[po_directory] po4a/po/ + +[type: sgml] securing-debian-howto.en.sgml \ + $lang:securing-debian-howto.$lang.sgml \ + add_$lang:?po4a/$lang.add \ + opt:"-M ISO-8859-1" + diff -Nru --exclude checkout --exclude fixinfo --exclude .cvsignore --exclude '*.po' --exclude '*.pot' --exclude '.svn**' --exclude 'es**' --exclude 'COMO-Asegurar-Debian.*' --exclude 'bin**' --exclude 'it**' --exclude 'pt-br**' --exclude 'ru**' --exclude 'zh-cn**' --exclude 'fr**' --exclude 'ja**' harden-doc-3.15/howto-source/README.translators harden-doc-3.15.1/howto-source/README.translators --- harden-doc-3.15/howto-source/README.translators 2010-08-30 01:02:16.000000000 -0400 +++ harden-doc-3.15.1/howto-source/README.translators 2012-06-21 11:57:27.000000000 -0400 @@ -80,10 +80,11 @@ (previously) André Luís Lopes <andrelop_AT_ig.com.br> 26 December 2002 - French: -(current version available is 3.4) - Simon Valiquette <[email protected]>, 8 october 2006 +(current version available is generated with po4a) + David Prévot <[email protected]> 21 June 2012 + (previously) Simon Valiquette <[email protected]>, 8 October 2006 (previously) Frédéric Bothamy <frederic.bothamy_AT_free.fr> - 14 october 2004 + 14 October 2004 (previously) Pierre Machard <pmachard_AT_tuxfamily.org> (previously) ASSAD Arnaud <arnaud_AT_cruncher.underlands.org> 26 March 2002 Les fichiers binaires /tmp/ymXonGrfwl/harden-doc-3.15/howto-source/securing-debian-howto.it.log.gz et /tmp/Hu6LMvNFU7/harden-doc-3.15.1/howto-source/securing-debian-howto.it.log.gz sont différents
