From f8333ae45213125436db763e635df8d31e08cae8 Mon Sep 17 00:00:00 2001 From: Raphael Hertzog Date: Fri, 11 Jan 2008 22:24:32 +0100 Subject: [PATCH] dpkg-gencontrol: Also force version in ${binary:Version} if -v is used. --- ChangeLog | 6 ++++++ debian/changelog | 3 +++ scripts/dpkg-gencontrol.pl | 1 + 3 files changed, 10 insertions(+) diff --git a/ChangeLog b/ChangeLog index c9d2623b..e1aa4bb3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2008-01-11 Raphael Hertzog + + * scripts/dpkg-gencontrol.pl: Also force version in ${binary:Version} + if dpkg-gencontrol -v is used. That way we're consistent + with the definition of that variable in deb-substvars(5). + 2008-01-10 Raphael Hertzog * debian/control: Add a "Breaks: dpkg-dev (= 1.14.13), diff --git a/debian/changelog b/debian/changelog index 0f368e94..cd63690b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -27,6 +27,9 @@ dpkg (1.14.16) UNRELEASED; urgency=low dpkg for the convenience of sid users. Closes: #459815 * Update dpkg-source(1) to explain better what the directory after -b is. Closes: #323606 + * Also force version in ${binary:Version} if dpkg-gencontrol -v + is used. That way we're consistent with the definition of that variable + in deb-substvars(5). Closes: #433477 [ Updated manpages translations ] * Fix typo in French. Closes: #460021 diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl index d927a8c0..3321c537 100755 --- a/scripts/dpkg-gencontrol.pl +++ b/scripts/dpkg-gencontrol.pl @@ -124,6 +124,7 @@ while (@ARGV) { my $changelog = parse_changelog($changelogfile, $changelogformat); $substvars->set_version_substvars($changelog->{"Version"}); $substvars->parse($varlistfile) if -e $varlistfile; +$substvars->set("binary:Version", $forceversion) if defined $forceversion; my $control = Dpkg::Control->new($controlfile); my $fields = Dpkg::Fields::Object->new(); -- 2.39.5