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=9c249dfe86857d6926d870c40ea4d33fc83c312b commit 9c249dfe86857d6926d870c40ea4d33fc83c312b Author: Guillem Jover <[email protected]> AuthorDate: Sun May 10 16:11:59 2020 +0200 build: Change po4a --porefs argument to match new behavior Starting with po4a 0.58, --porefs does not accept «wrap» anymore, which is now the default, and does not recognize «noline», which was an old alias for «file». Switch to use «file». --- README | 2 +- debian/changelog | 2 ++ debian/control | 4 ++-- man/Makefile.am | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/README b/README index 6a26e87fb..a08144823 100644 --- a/README +++ b/README @@ -56,7 +56,7 @@ the source should be roughly equivalent to the distributed tar source. To enable translated documentation this software will be needed: - po4a >= 0.43 + po4a >= 0.58 Building from tar source diff --git a/debian/changelog b/debian/changelog index 2c796fb7f..dad3ed76c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -45,6 +45,8 @@ dpkg (1.20.1) UNRELEASED; urgency=medium - Handle .git being a plain file when getting the dpkg tree version. - Add debian/changelog as a Changes file to the CPAN distribution. - 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”. * 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 c46b104cf..6f2aa5f35 100644 --- a/debian/control +++ b/debian/control @@ -13,8 +13,8 @@ Build-Depends: pkg-config, # Needed for ITS support. gettext (>= 0.19.7), -# Needed for --porefs. - po4a (>= 0.43), +# Needed for --porefs defaults. + po4a (>= 0.58), zlib1g-dev, libbz2-dev, liblzma-dev, diff --git a/man/Makefile.am b/man/Makefile.am index dbd6f61b2..a34a59599 100644 --- a/man/Makefile.am +++ b/man/Makefile.am @@ -148,7 +148,7 @@ PO4A_V_ = $(PO4A_V_@AM_DEFAULT_V@) PO4A_V_0 = @echo " PO4A $@"; PO4A_OPTS = --previous --srcdir $(srcdir) --destdir $(builddir) --no-backups \ - --porefs noline,wrap --msgmerge-opt=--add-location=file \ + --porefs file --msgmerge-opt=--add-location=file \ --package-name dpkg-man --package-version $(PACKAGE_VERSION) \ --copyright-holder "$(PACKAGE_COPYRIGHT_HOLDER)" \ --msgid-bugs-address $(PACKAGE_BUGREPORT) -- Dpkg.Org's dpkg
