[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Re: Considering an harden-doc upload for Wheezy

Hi Javier,

Le 19/08/2012 19:57, David Prévot a écrit :

> Would you consider a (team) upload for the securing-howto?

Assuming there won't be a NACK to this request, I simply went for it,
but uploaded it to DELAYED/6-day so you can simply ask me to revert it
if I'm wrong, or ACK it so I'll reschedule it.

> The debian/
> directory doesn't seem to be hosted on the DDP repository, would you
> mind to commit it there?

Done. Actually there were a bunch of unused and useless files in the
harden-doc package, I removed a fair amount of them. I think we should
simplify the build process in order to use the DDP securing-howto
directory as the root one for the package (instead of including it in
the howto-source directory of the package), that would allow us to
actually use the DDP as the package source, for real.

> Since the last upload, only the French translation has been updated, now
> handled with po4a, and is almost complete

s/almost// now (I completed it after my initial message).

Attached the filtered debdiff I'll submit to the release team once the
package reaches unstable. The real one being:

 234 files changed, 54193 insertions(+), 166541 deletions(-)

the 54150 other insertions being the POT and PO files, and the 166525
other deletions being the 227 unused and useless files removed from the
package.

Regards

David


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 <taffit@debian.org>  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 <jfs@computer.org>
-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 <v.simon@ieee.org>, 8 october 2006
+(current version available is generated with po4a)
+	David Prévot <taffit@debian.org> 21 June 2012
+        (previously) Simon Valiquette <v.simon@ieee.org>, 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

Attachment: signature.asc
Description: OpenPGP digital signature

Reply to: