The following commit has been merged in the master branch:
commit 822ea85c7c16d45f932f9c86f5ac0a04a8c304c2
Author: Guillem Jover <[email protected]>
Date: Mon Sep 19 17:01:23 2011 +0200
build: Use po4a --srcdir and --builddir
This avoids the absolute paths in the po4a Discard output messages,
and simplifies the build infrastructure by not needing the change
directory gymnastics and builddir po4a variable in the po4a.cfg file.
It's been enough time now since #538136 was filed precisely for dpkg
needs, to rely on these “new” options.
diff --git a/debian/changelog b/debian/changelog
index 7bf848f..5a3f82e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -221,6 +221,8 @@ dpkg (1.16.1) UNRELEASED; urgency=low
maintainer scripts due to that.
* Use the user name (instead of the user id) when setting the supplementary
groups in start-stop-daemon. Closes: #641834
+ * Use --srcdir and --destdir po4a options, and bump Build-Depends version
+ to 0.36.4.
[ Updated dpkg translations ]
* German (Sven Joachim). Closes: #620312
diff --git a/debian/control b/debian/control
index d03ac7e..5c49402 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.33.1),
+ gettext (>= 0.18), po4a (>= 0.36.4),
zlib1g-dev (>= 1:1.1.3-19.1), libbz2-dev,
libselinux1-dev (>= 1.28-4) [linux-any],
libncursesw5-dev,
diff --git a/man/Makefile.am b/man/Makefile.am
index da4279d..d989bf8 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -72,7 +72,7 @@ PO4A_V = $(PO4A_V_$(V))
PO4A_V_ = $(PO4A_V_$(AM_DEFAULT_VERBOSITY))
PO4A_V_0 = @echo " PO4A $@";
-PO4A_COMMON_OPTS = --previous --variable builddir=$(CURDIR)
+PO4A_COMMON_OPTS = --previous --srcdir $(srcdir) --destdir $(CURDIR)
PO4A_BUILD_OPTS = $(PO4A_COMMON_OPTS) --no-backups
all-local: all-local-@USE_PO4A@
@@ -82,8 +82,7 @@ all-local-yes: man.stamp
# FIXME: Use a stamp file until po4a supports them internally.
man.stamp:
- $(PO4A_V) cd $(srcdir) && \
- $(PO4A) $(PO4A_BUILD_OPTS) po/po4a.cfg
+ $(PO4A_V) $(PO4A) $(PO4A_BUILD_OPTS) $(srcdir)/po/po4a.cfg
$(AM_V_at) touch $@
clean-local: clean-local-@USE_PO4A@
@@ -96,8 +95,7 @@ clean-local-yes:
.PHONY: update-po
update-po:
- $(PO4A_V) cd $(srcdir) && \
- $(PO4A) $(PO4A_BUILD_OPTS) --force po/po4a.cfg
+ $(PO4A_V) $(PO4A) $(PO4A_BUILD_OPTS) --force $(srcdir)/po/po4a.cfg
install-data-local: install-data-local-@USE_PO4A@
diff --git a/man/po/po4a.cfg b/man/po/po4a.cfg
index 2848cda..f7869fc 100644
--- a/man/po/po4a.cfg
+++ b/man/po/po4a.cfg
@@ -14,207 +14,207 @@
opt_sv:"-L ISO-8859-1 -A utf-8"
[type:man] deb.5 \
- $lang:$(builddir)/$lang/deb.5 \
+ $lang:$lang/deb.5 \
add_$lang:po/$lang.add
[type:man] deb-control.5 \
- $lang:$(builddir)/$lang/deb-control.5 \
+ $lang:$lang/deb-control.5 \
add_$lang:po/$lang.add
[type:man] deb-src-control.5 \
- $lang:$(builddir)/$lang/deb-src-control.5 \
+ $lang:$lang/deb-src-control.5 \
add_$lang:po/$lang.add
[type:man] deb-split.5 \
- $lang:$(builddir)/$lang/deb-split.5 \
+ $lang:$lang/deb-split.5 \
add_$lang:po/$lang.add
[type:man] deb-version.5 \
- $lang:$(builddir)/$lang/deb-version.5 \
+ $lang:$lang/deb-version.5 \
add_$lang:po/$lang.add
[type:man] deb-old.5 \
- $lang:$(builddir)/$lang/deb-old.5 \
+ $lang:$lang/deb-old.5 \
add_$lang:po/$lang.add
[type:man] deb-override.5 \
- $lang:$(builddir)/$lang/deb-override.5 \
+ $lang:$lang/deb-override.5 \
add_$lang:po/$lang.add
[type:man] deb-extra-override.5 \
- $lang:$(builddir)/$lang/deb-extra-override.5 \
+ $lang:$lang/deb-extra-override.5 \
add_$lang:po/$lang.add
[type:man] deb-shlibs.5 \
- $lang:$(builddir)/$lang/deb-shlibs.5 \
+ $lang:$lang/deb-shlibs.5 \
add_$lang:po/$lang.add
[type:man] deb-substvars.5 \
- $lang:$(builddir)/$lang/deb-substvars.5 \
+ $lang:$lang/deb-substvars.5 \
add_$lang:po/$lang.add
[type:man] deb-symbols.5 \
- $lang:$(builddir)/$lang/deb-symbols.5 \
+ $lang:$lang/deb-symbols.5 \
add_$lang:po/$lang.add
[type:man] deb-triggers.5 \
- $lang:$(builddir)/$lang/deb-triggers.5 \
+ $lang:$lang/deb-triggers.5 \
add_$lang:po/$lang.add
[type:man] dpkg.1 \
- $lang:$(builddir)/$lang/dpkg.1 \
+ $lang:$lang/dpkg.1 \
add_$lang:po/$lang.add
[type:man] dpkg-architecture.1 \
- $lang:$(builddir)/$lang/dpkg-architecture.1 \
+ $lang:$lang/dpkg-architecture.1 \
add_$lang:po/$lang.add
[type:man] dpkg.cfg.5 \
- $lang:$(builddir)/$lang/dpkg.cfg.5 \
+ $lang:$lang/dpkg.cfg.5 \
add_$lang:po/$lang.add
[type:man] dpkg-buildflags.1 \
- $lang:$(builddir)/$lang/dpkg-buildflags.1 \
+ $lang:$lang/dpkg-buildflags.1 \
add_$lang:po/$lang.add
[type:man] dpkg-buildpackage.1 \
- $lang:$(builddir)/$lang/dpkg-buildpackage.1 \
+ $lang:$lang/dpkg-buildpackage.1 \
add_$lang:po/$lang.add
[type:man] dpkg-checkbuilddeps.1 \
- $lang:$(builddir)/$lang/dpkg-checkbuilddeps.1 \
+ $lang:$lang/dpkg-checkbuilddeps.1 \
add_$lang:po/$lang.add
[type:man] dpkg-distaddfile.1 \
- $lang:$(builddir)/$lang/dpkg-distaddfile.1 \
+ $lang:$lang/dpkg-distaddfile.1 \
add_$lang:po/$lang.add
[type:man] dpkg-deb.1 \
- $lang:$(builddir)/$lang/dpkg-deb.1 \
+ $lang:$lang/dpkg-deb.1 \
add_$lang:po/$lang.add
[type:man] dpkg-divert.8 \
- $lang:$(builddir)/$lang/dpkg-divert.8 \
+ $lang:$lang/dpkg-divert.8 \
add_$lang:po/$lang.add
[type:man] dpkg-genchanges.1 \
- $lang:$(builddir)/$lang/dpkg-genchanges.1 \
+ $lang:$lang/dpkg-genchanges.1 \
add_$lang:po/$lang.add
[type:man] dpkg-gencontrol.1 \
- $lang:$(builddir)/$lang/dpkg-gencontrol.1 \
+ $lang:$lang/dpkg-gencontrol.1 \
add_$lang:po/$lang.add
[type:man] dpkg-gensymbols.1 \
- $lang:$(builddir)/$lang/dpkg-gensymbols.1 \
+ $lang:$lang/dpkg-gensymbols.1 \
add_$lang:po/$lang.add
[type:man] dpkg-maintscript-helper.1 \
- $lang:$(builddir)/$lang/dpkg-maintscript-helper.1 \
+ $lang:$lang/dpkg-maintscript-helper.1 \
add_$lang:po/$lang.add
[type:man] dpkg-mergechangelogs.1 \
- $lang:$(builddir)/$lang/dpkg-mergechangelogs.1 \
+ $lang:$lang/dpkg-mergechangelogs.1 \
add_$lang:po/$lang.add
[type:man] dpkg-name.1 \
- $lang:$(builddir)/$lang/dpkg-name.1 \
+ $lang:$lang/dpkg-name.1 \
add_$lang:po/$lang.add
[type:man] dpkg-parsechangelog.1 \
- $lang:$(builddir)/$lang/dpkg-parsechangelog.1 \
+ $lang:$lang/dpkg-parsechangelog.1 \
add_$lang:po/$lang.add
[type:man] dpkg-query.1 \
- $lang:$(builddir)/$lang/dpkg-query.1 \
+ $lang:$lang/dpkg-query.1 \
add_$lang:po/$lang.add
[type:man] dpkg-scanpackages.1 \
- $lang:$(builddir)/$lang/dpkg-scanpackages.1 \
+ $lang:$lang/dpkg-scanpackages.1 \
add_$lang:po/$lang.add
[type:man] dpkg-scansources.1 \
- $lang:$(builddir)/$lang/dpkg-scansources.1 \
+ $lang:$lang/dpkg-scansources.1 \
add_$lang:po/$lang.add
[type:man] dpkg-shlibdeps.1 \
- $lang:$(builddir)/$lang/dpkg-shlibdeps.1 \
+ $lang:$lang/dpkg-shlibdeps.1 \
add_$lang:po/$lang.add
[type:man] dpkg-source.1 \
- $lang:$(builddir)/$lang/dpkg-source.1 \
+ $lang:$lang/dpkg-source.1 \
add_$lang:po/$lang.add
[type:man] dpkg-split.1 \
- $lang:$(builddir)/$lang/dpkg-split.1 \
+ $lang:$lang/dpkg-split.1 \
add_$lang:po/$lang.add
[type:man] dpkg-statoverride.8 \
- $lang:$(builddir)/$lang/dpkg-statoverride.8 \
+ $lang:$lang/dpkg-statoverride.8 \
add_$lang:po/$lang.add
[type:man] dpkg-trigger.1 \
- $lang:$(builddir)/$lang/dpkg-trigger.1 \
+ $lang:$lang/dpkg-trigger.1 \
add_$lang:po/$lang.add
[type:man] dpkg-vendor.1 \
- $lang:$(builddir)/$lang/dpkg-vendor.1 \
+ $lang:$lang/dpkg-vendor.1 \
add_$lang:po/$lang.add
[type:man] dselect.1 \
- $lang:$(builddir)/$lang/dselect.1 \
+ $lang:$lang/dselect.1 \
add_$lang:po/$lang.add
[type:man] dselect.cfg.5 \
- $lang:$(builddir)/$lang/dselect.cfg.5 \
+ $lang:$lang/dselect.cfg.5 \
add_$lang:po/$lang.add
[type:man] start-stop-daemon.8 \
- $lang:$(builddir)/$lang/start-stop-daemon.8 \
+ $lang:$lang/start-stop-daemon.8 \
add_$lang:po/$lang.add
[type:man] update-alternatives.8 \
- $lang:$(builddir)/$lang/update-alternatives.8 \
+ $lang:$lang/update-alternatives.8 \
add_$lang:po/$lang.add
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
