Browse Source

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

Raphael Hertzog 18 years ago
parent
commit
f8333ae452
3 changed files with 10 additions and 0 deletions
  1. 6 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 1 0
      scripts/dpkg-gencontrol.pl

+ 6 - 0
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),

+ 3 - 0
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

+ 1 - 0
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();