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=fec886786d2fe3ba6aaaf984a8a2e599eaed101e commit fec886786d2fe3ba6aaaf984a8a2e599eaed101e Author: Guillem Jover <[email protected]> AuthorDate: Sat May 23 21:27:00 2020 +0200 build: Use po4a conditional addendum support and remove empty addenda This is supported in po4a since 0.58. --- debian/changelog | 1 + debian/control | 2 +- man/po/it.add | 1 - man/po/nl.add | 1 - man/po/po4a.cfg | 2 +- man/po/pt_BR.add | 2 -- man/po/zh_CN.add | 0 7 files changed, 3 insertions(+), 6 deletions(-) diff --git a/debian/changelog b/debian/changelog index 389f3c845..f4d5549c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -72,6 +72,7 @@ dpkg (1.20.1) UNRELEASED; urgency=medium regression in its --srcdir support. - Switch to set the po4a addendum in the po4a_paths section instead of repeating it for each man page. + - Use po4a conditional addendum support, and remove empty addenda. * Packaging: - Switch to debhelper compatibility level 13. - Remove debian/tmp prefix from manpages debhelper fragment files. diff --git a/debian/control b/debian/control index 0d2bb3604..4fbeef929 100644 --- a/debian/control +++ b/debian/control @@ -13,7 +13,7 @@ Build-Depends: pkg-config, # Needed for ITS support. gettext (>= 0.19.7), -# Needed for --porefs defaults. +# Needed for --porefs defaults and conditional addenda. po4a (>= 0.59), zlib1g-dev, libbz2-dev, diff --git a/man/po/it.add b/man/po/it.add deleted file mode 100644 index add0adc3e..000000000 --- a/man/po/it.add +++ /dev/null @@ -1 +0,0 @@ -PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary diff --git a/man/po/nl.add b/man/po/nl.add deleted file mode 100644 index add0adc3e..000000000 --- a/man/po/nl.add +++ /dev/null @@ -1 +0,0 @@ -PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary diff --git a/man/po/po4a.cfg b/man/po/po4a.cfg index b910ecfaf..34b6857fd 100644 --- a/man/po/po4a.cfg +++ b/man/po/po4a.cfg @@ -1,5 +1,5 @@ [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 add_$lang:po/$lang.add +[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" diff --git a/man/po/pt_BR.add b/man/po/pt_BR.add deleted file mode 100644 index 644e99650..000000000 --- a/man/po/pt_BR.add +++ /dev/null @@ -1,2 +0,0 @@ -PO4A-HEADER:mode=after;position=^\.TH;beginboundary=FakePo4aBoundary - diff --git a/man/po/zh_CN.add b/man/po/zh_CN.add deleted file mode 100644 index e69de29bb..000000000 -- Dpkg.Org's dpkg
