dpkg-gencontrol: Also force version in ${binary:Version} if -v<version> is used.

diff --git a/ChangeLog b/ChangeLog
index c9d2623bbbf314ad022e16722fc5b54c5ed841a5..e1aa4bb350465a6c05f59857235dbb12bd269881 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-01-11  Raphael Hertzog  <hertzog@debian.org>
+
+       * scripts/dpkg-gencontrol.pl: Also force version in ${binary:Version}
+       if dpkg-gencontrol -v<version> is used. That way we're consistent
+       with the definition of that variable in deb-substvars(5).
+
 2008-01-10  Raphael Hertzog  <hertzog@debian.org>
 
        * debian/control: Add a "Breaks: dpkg-dev (= 1.14.13),

diff --git a/debian/changelog b/debian/changelog
index 0f368e94c4e7517be0c1480bed7f1c7bf471a638..cd63690b02052192ba1b5665ef19cf335954a295 100644 (file)
--- 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<version>
+    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 d927a8c0c04381c7b79f83c3af4808690db54eab..3321c537f9187132e43511a1b4ef91cd9f444489 100755 (executable)
--- 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();