The following commit has been merged in the master branch:
commit 8b5c07557253a44f54068bbac52655f0ac1ce9d2
Author: James Vega <[email protected]>
Date: Tue Sep 28 19:07:05 2010 -0400
Include command list in localized devscripts.1
Closes: #597906
Signed-off-by: James Vega <[email protected]>
diff --git a/Makefile b/Makefile
index 5c41d1e..2d382ea 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,7 @@ install: all install_scripts
make_scripts:
$(MAKE) -C scripts/
touch $@
-clean_scripts:
+clean_scripts: clean_translated_manpages
$(MAKE) -C scripts/ clean
install_scripts:
$(MAKE) -C scripts/ install DESTDIR=$(DESTDIR)
diff --git a/debian/changelog b/debian/changelog
index 3b0f378..cee489e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ devscripts (2.10.69) UNRELEASED; urgency=low
* po4a: Add targets to transform translated POD/DocBook files into man
pages. (Closes: #597782)
+ * Include command list in localized devscripts.1. (Closes: #597906)
-- James Vega <[email protected]> Thu, 23 Sep 2010 22:51:16 -0400
diff --git a/po4a/Makefile b/po4a/Makefile
index 290ce5f..27f79d6 100644
--- a/po4a/Makefile
+++ b/po4a/Makefile
@@ -4,15 +4,18 @@ GEN_TR_MAN1S := $(patsubst %.1,fr/%.fr.1,$(GEN_MAN1S))
all: translate $(GEN_TR_MAN1S)
translate:
+ $(MAKE) -C ../scripts/ devscripts.1
po4a --previous --no-backups devscripts-po4a.conf
touch translate
clean:
+# The po4a cleanup fails if devscripts.1 has already been cleaned up
+ $(MAKE) -C ../scripts/ devscripts.1
po4a --previous --rm-translations --no-backups devscripts-po4a.conf
- rm -f $(GEN_TR_MAN1S) translate
+ rm -f $(GEN_TR_MAN1S) translate ../scripts/devscripts.1
fr/%.fr.1: fr/%.fr.pl translate
podchecker $<
- pod2man --center=" " --release="Debian Utilities" $< > $@
+ pod2man --utf8 --center=" " --release="Utilitaires Debian" $< > $@
fr/%.fr.1: fr/%.fr.dbk translate
xsltproc --nonet -o $@ \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
diff --git a/po4a/devscripts-po4a.conf b/po4a/devscripts-po4a.conf
index 27eae1d..eae9d1e 100644
--- a/po4a/devscripts-po4a.conf
+++ b/po4a/devscripts-po4a.conf
@@ -62,7 +62,7 @@
fr:fr/debuild.fr.1 add_fr:add_fr/translator_man.add
[type:pod] ../scripts/desktop2menu.pl \
fr:fr/desktop2menu.fr.pl add_fr:add_fr/translator_pod.add
-[type:man] ../scripts/devscripts.1.in \
+[type:man] ../scripts/devscripts.1 \
fr:fr/devscripts.fr.1 add_fr:add_fr/translator_man.add
[type:pod] ../scripts/dget.pl \
fr:fr/dget.fr.pl add_fr:add_fr/translator_pod.add
diff --git a/scripts/Makefile b/scripts/Makefile
index 3ad68a2..a14479e 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -35,7 +35,7 @@ all: $(SCRIPTS) $(GEN_MAN1S) $(LIBS) $(CWRAPPERS)
$(COMPLETION)
%.1: %.pl
podchecker $<
- pod2man --center=" " --release="Debian Utilities" $< > $@
+ pod2man --utf8 --center=" " --release="Debian Utilities" $< > $@
%.1: %.dbk
xsltproc --nonet -o $@ \
/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl $<
--
Git repository for devscripts
--
To unsubscribe, send mail to [email protected].
