The following commit has been merged in the master branch:
commit 60d96dcc46e89fb4ab21b3a6850845d911d5fb3a
Author: James Vega <[email protected]>
Date: Thu Sep 23 22:53:45 2010 -0400
po4a: Add targets to transform translated POD/DocBook files into man pages.
Closes: #597782
Signed-off-by: James Vega <[email protected]>
diff --git a/Makefile b/Makefile
index 6b34f69..5c41d1e 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ DESTDIR =
PERL_MODULES = Devscripts
EXAMPLES = conf.default
-all: version scripts $(EXAMPLES) translated_manpages
+all: version make_scripts $(EXAMPLES) translated_manpages
version:
rm -f version
@@ -29,14 +29,15 @@ clean_translated_manpages:
rm -f translated_manpages
clean: clean_scripts clean_translated_manpages
- rm -f version conf.default
+ rm -f version conf.default make_scripts
install: all install_scripts
cp -a $(PERL_MODULES) $(DESTDIR)$(PERLMOD_DIR)
cp $(EXAMPLES) $(DESTDIR)$(EXAMPLES_DIR)
-scripts:
+make_scripts:
$(MAKE) -C scripts/
+ touch $@
clean_scripts:
$(MAKE) -C scripts/ clean
install_scripts:
diff --git a/Makefile.common b/Makefile.common
index 3664862..3ffa4b4 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1,3 +1,7 @@
+GEN_MAN1S := bts.1 build-rdeps.1 chdist.1 dcontrol.1 debcheckout.1 debcommit.1
\
+ deb-reversion.1 desktop2menu.1 dget.1 licensecheck.1 mass-bug.1 \
+ mk-build-deps.1 namecheck.1 rmadison.1 svnpath.1 tagpending.1 \
+ transition-check.1
PERLMOD_DIR = /usr/share/devscripts
EXAMPLES_DIR = /usr/share/devscripts
diff --git a/debian/changelog b/debian/changelog
index 295bb92..3b0f378 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+devscripts (2.10.69) UNRELEASED; urgency=low
+
+ * po4a: Add targets to transform translated POD/DocBook files into man
+ pages. (Closes: #597782)
+
+ -- James Vega <[email protected]> Thu, 23 Sep 2010 22:51:16 -0400
+
devscripts (2.10.68) unstable; urgency=low
[ James Vega ]
diff --git a/po4a/Makefile b/po4a/Makefile
index 9dcc350..290ce5f 100644
--- a/po4a/Makefile
+++ b/po4a/Makefile
@@ -1,4 +1,21 @@
-all:
+include ../Makefile.common
+GEN_TR_MAN1S := $(patsubst %.1,fr/%.fr.1,$(GEN_MAN1S))
+
+all: translate $(GEN_TR_MAN1S)
+
+translate:
po4a --previous --no-backups devscripts-po4a.conf
+ touch translate
clean:
po4a --previous --rm-translations --no-backups devscripts-po4a.conf
+ rm -f $(GEN_TR_MAN1S) translate
+
+fr/%.fr.1: fr/%.fr.pl translate
+ podchecker $<
+ pod2man --center=" " --release="Debian Utilities" $< > $@
+fr/%.fr.1: fr/%.fr.dbk translate
+ xsltproc --nonet -o $@ \
+ /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
+# xsltproc writes out to foo.1 even if you tell it to do otherwise, so we have
+# to rename the file after it's generated
+ mv fr/$*.1 $@
diff --git a/po4a/devscripts-po4a.conf b/po4a/devscripts-po4a.conf
index 7d8b79d..27eae1d 100644
--- a/po4a/devscripts-po4a.conf
+++ b/po4a/devscripts-po4a.conf
@@ -79,7 +79,7 @@
[type:man] ../scripts/grep-excuses.1 \
fr:fr/grep-excuses.fr.1 add_fr:add_fr/translator_man.add
[type:pod] ../scripts/licensecheck.pl \
- fr:fr/licencecheck.fr.pl add_fr:add_fr/translator_pod.add
+ fr:fr/licensecheck.fr.pl add_fr:add_fr/translator_pod.add
[type:man] ../scripts/list-unreleased.1 \
fr:fr/list-unreleased.fr.1 add_fr:add_fr/translator_man.add
[type:man] ../scripts/manpage-alert.1 \
diff --git a/po4a/po/fr.po b/po4a/po/fr.po
index ba07cf6..554d670 100644
--- a/po4a/po/fr.po
+++ b/po4a/po/fr.po
@@ -11321,7 +11321,7 @@ msgstr ""
#: ../scripts/devscripts.1.in:20
#, no-wrap
msgid "Header"
-msgstr ""
+msgstr "Header"
#. type: IP
#: ../scripts/devscripts.1.in:21
@@ -11333,7 +11333,7 @@ msgstr "\\s-1DEBEMAIL\\s0"
#: ../scripts/devscripts.1.in:22 ../scripts/devscripts.1.in:25
#, no-wrap
msgid "Item"
-msgstr ""
+msgstr "Item"
#. type: Plain text
#: ../scripts/devscripts.1.in:24
diff --git a/scripts/Makefile b/scripts/Makefile
index b1dbea9..3ad68a2 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -13,10 +13,7 @@ SCRIPTS = $(patsubst %.pl,%,$(PL_FILES)) $(patsubst
%.sh,%,$(SH_FILES))
COMPL_FILES := $(wildcard *.bash_completion)
COMPLETION = $(patsubst %.bash_completion,devscripts.%,$(COMPL_FILES))
-GEN_MAN1S = bts.1 build-rdeps.1 chdist.1 dcontrol.1 debcheckout.1 debcommit.1 \
- deb-reversion.1 desktop2menu.1 dget.1 licensecheck.1 mass-bug.1 \
- mk-build-deps.1 namecheck.1 rmadison.1 svnpath.1 tagpending.1 \
- transition-check.1 devscripts.1
+GEN_MAN1S += devscripts.1
BINDIR = /usr/bin
LIBDIR = /usr/lib/devscripts
@@ -36,7 +33,6 @@ all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS)
$(COMPLETION)
cp $< $@
chmod +x $@
-
%.1: %.pl
podchecker $<
pod2man --center=" " --release="Debian Utilities" $< > $@
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
