Source: dpkg
Version: 1.16.1
Severity: wishlist
Tags: patch
-- >8 --
Subject: Bump advertised po4a requirement to 0.41
The po4a --srcdir and --destdir options were introduced in version
0.36.4, but attempts to point --srcdir to a different directory than
the cwd when running po4a produced the message “master file was not
found” instead of doing something useful until version 0.41 (r2317,
2010-11-03).
Signed-off-by: Jonathan Nieder <jrnieder@gmail.com>
---
Hi,
Squeeze i386 system. Building dpkg master (but I assume the last
uploaded sid version would behave similarly):
| $ dpkg-query -W po4a
| po4a 0.40.2-1
| $ debian/rules build
[...]
| make[3]: Entering directory `/home/jrn/src/dpkg/build-tree/man'
| po4a --previous --srcdir ../../man --destdir /home/jrn/src/dpkg/build-tree/man --no-backups ../../man/po/po4a.cfg
| ../../man/po/po4a.cfg:17: The 'deb.5' master file does not exist.
| make[3]: *** [man.stamp] Error 9
| make[3]: Leaving directory `/home/jrn/src/dpkg/build-tree/man'
The upstream changelog for po4a in sid tells me that this is a known
problem --- versions before 0.41 would neglect to chdir to $srcdir at
the appropriate moment, making the --srcdir option mostly useless.
Building dpkg with "./configure --prefix=$HOME/opt/dpkg && make" so
$(srcdir) is . indeed avoids trouble.
Reverting commits 966a4f6b, 0ed90da7, and 822ea85c (build: Use po4a
--srcdir and --builddir, 2011-0919) avoids trouble, too, and that is
what I did locally. Short of that, how about this patch?
README | 2 +-
debian/changelog | 4 ++++
debian/control | 2 +-
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/README b/README
index 21957047..d03c21ad 100644
--- a/README
+++ b/README
@@ -69,7 +69,7 @@ To enable optional functionality or programs, this software might be needed:
To enable translated or additional («make doc») documentation this
software will be needed:
- po4a >= 0.36.4
+ po4a >= 0.36.4 (>= 0.41 for VPATH builds)
pod2man
doxygen
dot
diff --git a/debian/changelog b/debian/changelog
index 5c752625..43114e00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -20,6 +20,10 @@ dpkg (1.16.2) UNRELEASED; urgency=low
- Reduces the amount of work performed, including loading and parsing
unnecessary table files or calling either of gcc or dpkg programs.
+ [ Jonathan Nieder ]
+ * Bump po4a version in Build-Depends to 0.41, since earlier versions do
+ not handle --srcdir correctly.
+
[ Updated man page translations ]
* German (Helge Kreutzmann).
diff --git a/debian/control b/debian/control
index 3b57b716..b9d347e7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,7 +10,7 @@ Vcs-Browser: http://git.debian.org/?p=dpkg/dpkg.git
Vcs-Git: git://git.debian.org/git/dpkg/dpkg.git
Standards-Version: 3.9.2
Build-Depends: debhelper (>= 7), pkg-config, flex,
- gettext (>= 0.18), po4a (>= 0.36.4),
+ gettext (>= 0.18), po4a (>= 0.41),
zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev,
libselinux1-dev (>= 1.28-4) [linux-any],
libncursesw5-dev,
--
1.7.7.rc1