Support binNMU safe packages even when source and binary differ in

version.

ChangeLog

@@ -1,3 +1,9 @@
+2006-05-04  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-gencontrol.pl: Use the source:Version substvar when
+	setting the Source field version, in case the binary package
+	has a different one from the source package.
+
 2006-05-02  Guillem Jover  <guillem@debian.org>
 
 	* utils/start-stop-daemon.c (do_help): Standarize output format.

debian/changelog

@@ -36,6 +36,8 @@ dpkg (1.13.19~) UNRELEASED; urgency=low
   * Add new substvars source:Version, source:Upstream-Version and
     binary:Version so packages will be able to avoid breaking on binNMUs.
     Based on a patch by Ken Bloom and Jeroen van Wolffelaar. Closes: #358530
+  * Support binNMU safe packages even when source and binary differ in
+    version.
   * Rename dpkg:UpstreamVersion to dpkg:Upstream-Version. Make dpkg:Version
     and dpkg:Upstream-Version get the current dpkg versions instead of the
     ones from the package being built.

scripts/dpkg-gencontrol.pl

@@ -212,7 +212,7 @@ $oppackage= $f{'Package'};
 $verdiff= $f{'Version'} ne $sourceversion;
 if ($oppackage ne $sourcepackage || $verdiff) {
     $f{'Source'}= $sourcepackage;
-    $f{'Source'}.= " ($sourceversion)" if $verdiff;
+    $f{'Source'}.= " ($substvar{'source:Version'})" if $verdiff;
 }
 
 if (!defined($substvar{'Installed-Size'})) {