This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=cda14fdbdd0dcae64495e25c2ae7c21a4a7a3c14 commit cda14fdbdd0dcae64495e25c2ae7c21a4a7a3c14 Author: Guillem Jover <[email protected]> AuthorDate: Sun May 10 16:14:02 2020 +0200 build: Switch to set the po4a addendum in the po4a_paths section Given that we have to depend on 0.58 anyway, we can now refactor the addendum setting in the po4a_paths, reducing duplication substantially. --- debian/changelog | 2 + man/po/po4a.cfg | 225 ++++++++++++++----------------------------------------- 2 files changed, 59 insertions(+), 168 deletions(-) diff --git a/debian/changelog b/debian/changelog index dad3ed76c..afcf2723c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -47,6 +47,8 @@ dpkg (1.20.1) UNRELEASED; urgency=medium - Set DPKG_SERIES to 1.20.x when running the functional test suite. - Change po4a --porefs argument from no longer supported “noline,wrap” to “file”. + - Switch to set the po4a addendum in the po4a_paths section instead of + repeating it for each man page. * Packaging: - Switch to debhelper compatibility level 13. - Remove debian/tmp prefix from manpages debhelper fragment files. diff --git a/man/po/po4a.cfg b/man/po/po4a.cfg index f95f5ef33..34b6857fd 100644 --- a/man/po/po4a.cfg +++ b/man/po/po4a.cfg @@ -1,173 +1,62 @@ [po4a_langs] de es fr hu it ja nl pl pt_BR ru sv zh_CN -[po4a_paths] po/dpkg-man.pot $lang:po/$lang.po +[po4a_paths] po/dpkg-man.pot $lang:po/$lang.po add_$lang:?po/$lang.add # Make sure the man pages are generated with the right encoding. [po4a_alias:man] man opt:"-M UTF-8 -L UTF-8 -A UTF-8" -[type:man] deb.man $lang:$lang/deb.man \ - add_$lang:po/$lang.add - -[type:man] deb822.man $lang:$lang/deb822.man \ - add_$lang:po/$lang.add - -[type:man] deb-buildinfo.man $lang:$lang/deb-buildinfo.man \ - add_$lang:po/$lang.add - -[type:man] deb-changelog.man $lang:$lang/deb-changelog.man \ - add_$lang:po/$lang.add - -[type:man] deb-changes.man $lang:$lang/deb-changes.man \ - add_$lang:po/$lang.add - -[type:man] deb-control.man $lang:$lang/deb-control.man \ - add_$lang:po/$lang.add - -[type:man] deb-conffiles.man $lang:$lang/deb-conffiles.man \ - add_$lang:po/$lang.add - -[type:man] deb-src-control.man $lang:$lang/deb-src-control.man \ - add_$lang:po/$lang.add - -[type:man] deb-src-files.man $lang:$lang/deb-src-files.man \ - add_$lang:po/$lang.add - -[type:man] deb-src-rules.man $lang:$lang/deb-src-rules.man \ - add_$lang:po/$lang.add - -[type:man] deb-src-symbols.man $lang:$lang/deb-src-symbols.man \ - add_$lang:po/$lang.add - -[type:man] deb-split.man $lang:$lang/deb-split.man \ - add_$lang:po/$lang.add - -[type:man] deb-version.man $lang:$lang/deb-version.man \ - add_$lang:po/$lang.add - -[type:man] deb-old.man $lang:$lang/deb-old.man \ - add_$lang:po/$lang.add - -[type:man] deb-origin.man $lang:$lang/deb-origin.man \ - add_$lang:po/$lang.add - -[type:man] deb-override.man $lang:$lang/deb-override.man \ - add_$lang:po/$lang.add - -[type:man] deb-extra-override.man $lang:$lang/deb-extra-override.man \ - add_$lang:po/$lang.add - -[type:man] deb-shlibs.man $lang:$lang/deb-shlibs.man \ - add_$lang:po/$lang.add - -[type:man] deb-substvars.man $lang:$lang/deb-substvars.man \ - add_$lang:po/$lang.add - -[type:man] deb-symbols.man $lang:$lang/deb-symbols.man \ - add_$lang:po/$lang.add - -[type:man] deb-postinst.man $lang:$lang/deb-postinst.man \ - add_$lang:po/$lang.add - -[type:man] deb-postrm.man $lang:$lang/deb-postrm.man \ - add_$lang:po/$lang.add - -[type:man] deb-preinst.man $lang:$lang/deb-preinst.man \ - add_$lang:po/$lang.add - -[type:man] deb-prerm.man $lang:$lang/deb-prerm.man \ - add_$lang:po/$lang.add - -[type:man] deb-triggers.man $lang:$lang/deb-triggers.man \ - add_$lang:po/$lang.add - -[type:man] dsc.man $lang:$lang/dsc.man \ - add_$lang:po/$lang.add - -[type:man] dpkg.man $lang:$lang/dpkg.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-architecture.man $lang:$lang/dpkg-architecture.man \ - add_$lang:po/$lang.add - -[type:man] dpkg.cfg.man $lang:$lang/dpkg.cfg.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-buildflags.man $lang:$lang/dpkg-buildflags.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-buildpackage.man $lang:$lang/dpkg-buildpackage.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-genbuildinfo.man $lang:$lang/dpkg-genbuildinfo.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-checkbuilddeps.man $lang:$lang/dpkg-checkbuilddeps.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-distaddfile.man $lang:$lang/dpkg-distaddfile.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-deb.man $lang:$lang/dpkg-deb.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-divert.man $lang:$lang/dpkg-divert.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-genchanges.man $lang:$lang/dpkg-genchanges.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-gencontrol.man $lang:$lang/dpkg-gencontrol.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-gensymbols.man $lang:$lang/dpkg-gensymbols.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-maintscript-helper.man $lang:$lang/dpkg-maintscript-helper.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-mergechangelogs.man $lang:$lang/dpkg-mergechangelogs.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-name.man $lang:$lang/dpkg-name.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-parsechangelog.man $lang:$lang/dpkg-parsechangelog.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-query.man $lang:$lang/dpkg-query.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-scanpackages.man $lang:$lang/dpkg-scanpackages.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-scansources.man $lang:$lang/dpkg-scansources.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-shlibdeps.man $lang:$lang/dpkg-shlibdeps.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-source.man $lang:$lang/dpkg-source.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-split.man $lang:$lang/dpkg-split.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-statoverride.man $lang:$lang/dpkg-statoverride.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-trigger.man $lang:$lang/dpkg-trigger.man \ - add_$lang:po/$lang.add - -[type:man] dpkg-vendor.man $lang:$lang/dpkg-vendor.man \ - add_$lang:po/$lang.add - -[type:man] dselect.man $lang:$lang/dselect.man \ - add_$lang:po/$lang.add - -[type:man] dselect.cfg.man $lang:$lang/dselect.cfg.man \ - add_$lang:po/$lang.add - -[type:man] start-stop-daemon.man $lang:$lang/start-stop-daemon.man \ - add_$lang:po/$lang.add - -[type:man] update-alternatives.man $lang:$lang/update-alternatives.man \ - add_$lang:po/$lang.add +[type:man] deb.man $lang:$lang/deb.man +[type:man] deb822.man $lang:$lang/deb822.man +[type:man] deb-buildinfo.man $lang:$lang/deb-buildinfo.man +[type:man] deb-changelog.man $lang:$lang/deb-changelog.man +[type:man] deb-changes.man $lang:$lang/deb-changes.man +[type:man] deb-control.man $lang:$lang/deb-control.man +[type:man] deb-conffiles.man $lang:$lang/deb-conffiles.man +[type:man] deb-src-control.man $lang:$lang/deb-src-control.man +[type:man] deb-src-files.man $lang:$lang/deb-src-files.man +[type:man] deb-src-rules.man $lang:$lang/deb-src-rules.man +[type:man] deb-src-symbols.man $lang:$lang/deb-src-symbols.man +[type:man] deb-split.man $lang:$lang/deb-split.man +[type:man] deb-version.man $lang:$lang/deb-version.man +[type:man] deb-old.man $lang:$lang/deb-old.man +[type:man] deb-origin.man $lang:$lang/deb-origin.man +[type:man] deb-override.man $lang:$lang/deb-override.man +[type:man] deb-extra-override.man $lang:$lang/deb-extra-override.man +[type:man] deb-shlibs.man $lang:$lang/deb-shlibs.man +[type:man] deb-substvars.man $lang:$lang/deb-substvars.man +[type:man] deb-symbols.man $lang:$lang/deb-symbols.man +[type:man] deb-postinst.man $lang:$lang/deb-postinst.man +[type:man] deb-postrm.man $lang:$lang/deb-postrm.man +[type:man] deb-preinst.man $lang:$lang/deb-preinst.man +[type:man] deb-prerm.man $lang:$lang/deb-prerm.man +[type:man] deb-triggers.man $lang:$lang/deb-triggers.man +[type:man] dsc.man $lang:$lang/dsc.man +[type:man] dpkg.man $lang:$lang/dpkg.man +[type:man] dpkg-architecture.man $lang:$lang/dpkg-architecture.man +[type:man] dpkg.cfg.man $lang:$lang/dpkg.cfg.man +[type:man] dpkg-buildflags.man $lang:$lang/dpkg-buildflags.man +[type:man] dpkg-buildpackage.man $lang:$lang/dpkg-buildpackage.man +[type:man] dpkg-genbuildinfo.man $lang:$lang/dpkg-genbuildinfo.man +[type:man] dpkg-checkbuilddeps.man $lang:$lang/dpkg-checkbuilddeps.man +[type:man] dpkg-distaddfile.man $lang:$lang/dpkg-distaddfile.man +[type:man] dpkg-deb.man $lang:$lang/dpkg-deb.man +[type:man] dpkg-divert.man $lang:$lang/dpkg-divert.man +[type:man] dpkg-genchanges.man $lang:$lang/dpkg-genchanges.man +[type:man] dpkg-gencontrol.man $lang:$lang/dpkg-gencontrol.man +[type:man] dpkg-gensymbols.man $lang:$lang/dpkg-gensymbols.man +[type:man] dpkg-maintscript-helper.man $lang:$lang/dpkg-maintscript-helper.man +[type:man] dpkg-mergechangelogs.man $lang:$lang/dpkg-mergechangelogs.man +[type:man] dpkg-name.man $lang:$lang/dpkg-name.man +[type:man] dpkg-parsechangelog.man $lang:$lang/dpkg-parsechangelog.man +[type:man] dpkg-query.man $lang:$lang/dpkg-query.man +[type:man] dpkg-scanpackages.man $lang:$lang/dpkg-scanpackages.man +[type:man] dpkg-scansources.man $lang:$lang/dpkg-scansources.man +[type:man] dpkg-shlibdeps.man $lang:$lang/dpkg-shlibdeps.man +[type:man] dpkg-source.man $lang:$lang/dpkg-source.man +[type:man] dpkg-split.man $lang:$lang/dpkg-split.man +[type:man] dpkg-statoverride.man $lang:$lang/dpkg-statoverride.man +[type:man] dpkg-trigger.man $lang:$lang/dpkg-trigger.man +[type:man] dpkg-vendor.man $lang:$lang/dpkg-vendor.man +[type:man] dselect.man $lang:$lang/dselect.man +[type:man] dselect.cfg.man $lang:$lang/dselect.cfg.man +[type:man] start-stop-daemon.man $lang:$lang/start-stop-daemon.man +[type:man] update-alternatives.man $lang:$lang/update-alternatives.man -- Dpkg.Org's dpkg
