[Reproducible-commits] [dpkg] 02/03: Revert "build: Use po4a --srcdir and --builddir"
Holger Levsen
holger at layer-acht.org
Tue May 3 08:43:35 UTC 2016
This is an automated email from the git hooks/post-receive script.
holger pushed a commit to annotated tag 1.16.1.1_bpo60+2
in repository dpkg.
commit 3b3edb538cdf8728c801324be812d1c8896cd81c
Author: Raphaël Hertzog <hertzog at debian.org>
Date: Wed Nov 23 14:56:55 2011 +0100
Revert "build: Use po4a --srcdir and --builddir"
This reverts commit 822ea85c7c16d45f932f9c86f5ac0a04a8c304c2.
The squeeze version of po4a (0.40.2-1) does not work as
expected with --srcdir. The switch to srcdir happens after
the check of the existence of the master file and it thus
fails with “The 'deb.5' master file does not exist.”. The
wheezy version (0.41-1) is not affected by this problem.
Conflicts:
man/Makefile.am
man/po/po4a.cfg
---
debian/changelog | 6 +++--
debian/control | 2 +-
man/Makefile.am | 8 +++---
man/po/po4a.cfg | 82 ++++++++++++++++++++++++++++----------------------------
4 files changed, 51 insertions(+), 47 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 1e4c307..fdaba51 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ dpkg (1.16.1.1~bpo60+2) UNRELEASED; urgency=low
* Only build dpkg-dev and libdpkg-perl as discussed with the backports
team: http://lists.debian.org/debian-backports/2011/11/msg00030.html
+ * Revert usage of po4a --srcdir --destdir since the squeeze version
+ does not work as expected (it fails with “The 'deb.5' master file does
+ not exist.” since the switch to srcdir happens too late in the code,
+ the wheezy version does not have this problem).
-- Raphaël Hertzog <hertzog at debian.org> Wed, 23 Nov 2011 13:48:47 +0100
@@ -264,8 +268,6 @@ dpkg (1.16.1) unstable; 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 6b9c96c..0c13a51 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.33.1),
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 12bf44b..45950d3 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_OPTS = --previous --srcdir $(srcdir) --destdir $(CURDIR) --no-backups
+PO4A_OPTS = --previous --variable builddir=$(CURDIR) --no-backups
all-local: all-local- at USE_PO4A@
@@ -81,7 +81,8 @@ all-local-yes: man.stamp
# FIXME: Use a stamp file until po4a supports them internally.
man.stamp:
- $(PO4A_V) $(PO4A) $(PO4A_OPTS) $(srcdir)/po/po4a.cfg
+ $(PO4A_V) cd $(srcdir) && \
+ $(PO4A) $(PO4A_OPTS) po/po4a.cfg
$(AM_V_at) touch $@
clean-local: clean-local- at USE_PO4A@
@@ -94,7 +95,8 @@ clean-local-yes:
.PHONY: update-po
update-po:
- $(PO4A_V) $(PO4A) $(PO4A_OPTS) --force $(srcdir)/po/po4a.cfg
+ $(PO4A_V) cd $(srcdir) && \
+ $(PO4A) $(PO4A_OPTS) --force po/po4a.cfg
install-data-local: install-data-local- at USE_PO4A@
diff --git a/man/po/po4a.cfg b/man/po/po4a.cfg
index d9e651a..034c90e 100644
--- a/man/po/po4a.cfg
+++ b/man/po/po4a.cfg
@@ -13,125 +13,125 @@
opt_ru:"-L koi8-r -A utf-8" \
opt_sv:"-L ISO-8859-1 -A utf-8"
-[type:man] deb.5 $lang:$lang/deb.5 \
+[type:man] deb.5 $lang:$(builddir)/$lang/deb.5 \
add_$lang:po/$lang.add
-[type:man] deb-control.5 $lang:$lang/deb-control.5 \
+[type:man] deb-control.5 $lang:$(builddir)/$lang/deb-control.5 \
add_$lang:po/$lang.add
-[type:man] deb-src-control.5 $lang:$lang/deb-src-control.5 \
+[type:man] deb-src-control.5 $lang:$(builddir)/$lang/deb-src-control.5 \
add_$lang:po/$lang.add
-[type:man] deb-split.5 $lang:$lang/deb-split.5 \
+[type:man] deb-split.5 $lang:$(builddir)/$lang/deb-split.5 \
add_$lang:po/$lang.add
-[type:man] deb-version.5 $lang:$lang/deb-version.5 \
+[type:man] deb-version.5 $lang:$(builddir)/$lang/deb-version.5 \
add_$lang:po/$lang.add
-[type:man] deb-old.5 $lang:$lang/deb-old.5 \
+[type:man] deb-old.5 $lang:$(builddir)/$lang/deb-old.5 \
add_$lang:po/$lang.add
-[type:man] deb-override.5 $lang:$lang/deb-override.5 \
+[type:man] deb-override.5 $lang:$(builddir)/$lang/deb-override.5 \
add_$lang:po/$lang.add
-[type:man] deb-extra-override.5 $lang:$lang/deb-extra-override.5 \
+[type:man] deb-extra-override.5 $lang:$(builddir)/$lang/deb-extra-override.5 \
add_$lang:po/$lang.add
-[type:man] deb-shlibs.5 $lang:$lang/deb-shlibs.5 \
+[type:man] deb-shlibs.5 $lang:$(builddir)/$lang/deb-shlibs.5 \
add_$lang:po/$lang.add
-[type:man] deb-substvars.5 $lang:$lang/deb-substvars.5 \
+[type:man] deb-substvars.5 $lang:$(builddir)/$lang/deb-substvars.5 \
add_$lang:po/$lang.add
-[type:man] deb-symbols.5 $lang:$lang/deb-symbols.5 \
+[type:man] deb-symbols.5 $lang:$(builddir)/$lang/deb-symbols.5 \
add_$lang:po/$lang.add
-[type:man] deb-triggers.5 $lang:$lang/deb-triggers.5 \
+[type:man] deb-triggers.5 $lang:$(builddir)/$lang/deb-triggers.5 \
add_$lang:po/$lang.add
-[type:man] dpkg.1 $lang:$lang/dpkg.1 \
+[type:man] dpkg.1 $lang:$(builddir)/$lang/dpkg.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-architecture.1 $lang:$lang/dpkg-architecture.1 \
+[type:man] dpkg-architecture.1 $lang:$(builddir)/$lang/dpkg-architecture.1 \
add_$lang:po/$lang.add
-[type:man] dpkg.cfg.5 $lang:$lang/dpkg.cfg.5 \
+[type:man] dpkg.cfg.5 $lang:$(builddir)/$lang/dpkg.cfg.5 \
add_$lang:po/$lang.add
-[type:man] dpkg-buildflags.1 $lang:$lang/dpkg-buildflags.1 \
+[type:man] dpkg-buildflags.1 $lang:$(builddir)/$lang/dpkg-buildflags.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-buildpackage.1 $lang:$lang/dpkg-buildpackage.1 \
+[type:man] dpkg-buildpackage.1 $lang:$(builddir)/$lang/dpkg-buildpackage.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-checkbuilddeps.1 $lang:$lang/dpkg-checkbuilddeps.1 \
+[type:man] dpkg-checkbuilddeps.1 $lang:$(builddir)/$lang/dpkg-checkbuilddeps.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-distaddfile.1 $lang:$lang/dpkg-distaddfile.1 \
+[type:man] dpkg-distaddfile.1 $lang:$(builddir)/$lang/dpkg-distaddfile.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-deb.1 $lang:$lang/dpkg-deb.1 \
+[type:man] dpkg-deb.1 $lang:$(builddir)/$lang/dpkg-deb.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-divert.8 $lang:$lang/dpkg-divert.8 \
+[type:man] dpkg-divert.8 $lang:$(builddir)/$lang/dpkg-divert.8 \
add_$lang:po/$lang.add
-[type:man] dpkg-genchanges.1 $lang:$lang/dpkg-genchanges.1 \
+[type:man] dpkg-genchanges.1 $lang:$(builddir)/$lang/dpkg-genchanges.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-gencontrol.1 $lang:$lang/dpkg-gencontrol.1 \
+[type:man] dpkg-gencontrol.1 $lang:$(builddir)/$lang/dpkg-gencontrol.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-gensymbols.1 $lang:$lang/dpkg-gensymbols.1 \
+[type:man] dpkg-gensymbols.1 $lang:$(builddir)/$lang/dpkg-gensymbols.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-maintscript-helper.1 $lang:$lang/dpkg-maintscript-helper.1 \
+[type:man] dpkg-maintscript-helper.1 $lang:$(builddir)/$lang/dpkg-maintscript-helper.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-mergechangelogs.1 $lang:$lang/dpkg-mergechangelogs.1 \
+[type:man] dpkg-mergechangelogs.1 $lang:$(builddir)/$lang/dpkg-mergechangelogs.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-name.1 $lang:$lang/dpkg-name.1 \
+[type:man] dpkg-name.1 $lang:$(builddir)/$lang/dpkg-name.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-parsechangelog.1 $lang:$lang/dpkg-parsechangelog.1 \
+[type:man] dpkg-parsechangelog.1 $lang:$(builddir)/$lang/dpkg-parsechangelog.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-query.1 $lang:$lang/dpkg-query.1 \
+[type:man] dpkg-query.1 $lang:$(builddir)/$lang/dpkg-query.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-scanpackages.1 $lang:$lang/dpkg-scanpackages.1 \
+[type:man] dpkg-scanpackages.1 $lang:$(builddir)/$lang/dpkg-scanpackages.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-scansources.1 $lang:$lang/dpkg-scansources.1 \
+[type:man] dpkg-scansources.1 $lang:$(builddir)/$lang/dpkg-scansources.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-shlibdeps.1 $lang:$lang/dpkg-shlibdeps.1 \
+[type:man] dpkg-shlibdeps.1 $lang:$(builddir)/$lang/dpkg-shlibdeps.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-source.1 $lang:$lang/dpkg-source.1 \
+[type:man] dpkg-source.1 $lang:$(builddir)/$lang/dpkg-source.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-split.1 $lang:$lang/dpkg-split.1 \
+[type:man] dpkg-split.1 $lang:$(builddir)/$lang/dpkg-split.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-statoverride.8 $lang:$lang/dpkg-statoverride.8 \
+[type:man] dpkg-statoverride.8 $lang:$(builddir)/$lang/dpkg-statoverride.8 \
add_$lang:po/$lang.add
-[type:man] dpkg-trigger.1 $lang:$lang/dpkg-trigger.1 \
+[type:man] dpkg-trigger.1 $lang:$(builddir)/$lang/dpkg-trigger.1 \
add_$lang:po/$lang.add
-[type:man] dpkg-vendor.1 $lang:$lang/dpkg-vendor.1 \
+[type:man] dpkg-vendor.1 $lang:$(builddir)/$lang/dpkg-vendor.1 \
add_$lang:po/$lang.add
-[type:man] dselect.1 $lang:$lang/dselect.1 \
+[type:man] dselect.1 $lang:$(builddir)/$lang/dselect.1 \
add_$lang:po/$lang.add
-[type:man] dselect.cfg.5 $lang:$lang/dselect.cfg.5 \
+[type:man] dselect.cfg.5 $lang:$(builddir)/$lang/dselect.cfg.5 \
add_$lang:po/$lang.add
-[type:man] start-stop-daemon.8 $lang:$lang/start-stop-daemon.8 \
+[type:man] start-stop-daemon.8 $lang:$(builddir)/$lang/start-stop-daemon.8 \
add_$lang:po/$lang.add
-[type:man] update-alternatives.8 $lang:$lang/update-alternatives.8 \
+[type:man] update-alternatives.8 $lang:$(builddir)/$lang/update-alternatives.8 \
add_$lang:po/$lang.add
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git
More information about the Reproducible-commits
mailing list