Package: harden-doc
Version: 3.15
Severity: wishlist
Tags: patch l10n
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Hi Javier,
Please find attach the tiny patch I intend to commit to the DDP
(removing the fr/ directory, adding the PO file [0] and a POT file:
“touch po4a/po/securing-howto.pot && po4a --force po4a/po4a.cfg” will do
the last trick). Since I'm not a Makefile expert, the proposed patch can
surely be improved. Unless someone objects or beat me into it, I'll
commit this patch to the DDP and will take care of the (hopefully
inexistent) build issues on www-master (“ddp build failed”).
0: http://people.debian.org/~taffit/securing-howto/fr.po
Furthermore, I didn't find the harden-doc/debian directory in the DDP,
and thus was not able to provide the accurate debian/control and
debian/changelog update, can you please point me to its VCS?
Regards
David
- -- System Information:
Debian Release: wheezy/sid
APT prefers unstable
APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 3.2.0-2-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
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)
iQIcBAEBCAAGBQJPeLqKAAoJELgqIXr9/gny5RgP/3JZ5vTnfLNxRJ0Y6emfpals
j3XaGqPNYff26OzEdMZxWJXr68MbcTWNIzFmnrYM7gDZ31e1dRfXkeTmf4mljQux
/sHtDrZxoQrueStbi1ImzmPbcVIMO9eeKs1+tiTCkplL76SDjt7Lr/NdVOQmWbuU
RzDlsPXeM5jiBKigCfxp57CasL43zJjE9teLLUd6YZ2DgeepZ5TowSF9UB3E5eWd
TMkvuLQHv3ija5RIcJ3L+qFTbNltBLL+CwK8qWsRRU5XmTL6HDDO+/NeQzojWF0e
aglltVfi7Ufnoyo3G8MDzf/kV+kDbPvFwjk/x8bKTaQ6mVcx/UMuVB75zNvcjOLH
fSqatBGjPDiEHFRUDI64gV0+jBR7+z5f3B5Co/8PSd9zkzMLQCXFkPWQm6HKV+zA
0SP8XcufkkAUQtkhMs5VLjUtR6ocQLS/rAVUN5EsBgfJL3zaucDwdqLjZvOPgl7l
39sB71G3TfLQBRw/9okez0V0uyYomiUxggsoblSHGyhq2Wc3qqPLNuomkti+a9ce
kpHX26T4bDu0zJxRjwMP3gIptSREq4m03UGqIHFOLH0NiXweSwnfwkvGb2t2p15W
2A1H0N8B4k+35LhBUJa9Wvx+JwFo3hK2cluSXvayF5b4OGdF2Off9qbWxSWFC3xy
6wsH7J8Ws2gsWfmKQu20
=ERAm
-----END PGP SIGNATURE-----
Index: po4a/po4a.cfg
===================================================================
--- po4a/po4a.cfg (révision 0)
+++ po4a/po4a.cfg (révision 0)
@@ -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"
+
Index: Makefile
===================================================================
--- Makefile (révision 9169)
+++ Makefile (copie de travail)
@@ -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
+# 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
-# 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
# 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|\
