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.

ChangeLog

@@ -1,3 +1,10 @@
+2006-05-02  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-genchanges.pl: Rename dpkg:UpstreamVersion to
+	dpkg:Upstream-Version. Make dpkg:Version and dpkg:Upstream-Version
+	get the current dpkg versions instead of the package being built.
+	* scripts/dpkg-gencontrol.pl: Likewise.
+
 2006-05-02  Ken Bloom  <kbloom@gmail.com>,
             Jeroen van Wolffelaar  <jeroen@wolffelaar.nl>,
             Guillem Jover  <guillem@debian.org>

debian/changelog

@@ -35,6 +35,9 @@ 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
+  * 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.
 
  -- Christian Perrier <bubulle@debian.org>  Sat, 29 Apr 2006 14:28:55 +0200
 

man/C/dpkg-source.1

@@ -771,7 +771,7 @@ Variable settings with names of this form are generated by
 .B dpkg\-shlibdeps
 - see above.
 .TP
-.B dpkg:UpstreamVersion
+.B dpkg:Upstream\-Version
 The upstream version of dpkg.
 .TP
 .B dpkg:Version

man/ChangeLog

@@ -1,3 +1,8 @@
+2006-05-02  Guillem Jover  <guillem@debian.org>
+
+	* C/dpkg-source.1: Rename dpkg:UpstreamVersion to
+	dpkg:Upstream-Version.
+
 2006-05-02  Guillem Jover  <guillem@debian.org>
 
 	* C/dpkg-source.1: Document new source:Version,

scripts/dpkg-genchanges.pl

@@ -259,10 +259,9 @@ for $p (keys %p2f) {
 # Extract version and origversion so we can add them to our fixed list
 # of substvars
 
-$version= $f{'Version'};
-$origversion= $version; $origversion =~ s/-[^-]+$//;
-$substvar{"dpkg:UpstreamVersion"}=$origversion;
-$substvar{"dpkg:Version"}=$version;
+$substvar{"dpkg:Version"} = $version;
+$substvar{"dpkg:Upstream-Version"} = $version;
+$substvar{"dpkg:Upstream-Version"} =~ s/-[^-]+$//;
 
 if (!$binaryonly) {
     $sec= $sourcedefault{'Section'};

scripts/dpkg-gencontrol.pl

@@ -169,10 +169,10 @@ for $_ (keys %fi) {
 }
 
 $f{'Version'}= $forceversion if length($forceversion);
-$version= $f{'Version'};
-$origversion= $version; $origversion =~ s/-[^-]+$//;
-$substvar{"dpkg:UpstreamVersion"}=$origversion;
-$substvar{"dpkg:Version"}=$version;
+
+$substvar{"dpkg:Version"} = $version;
+$substvar{"dpkg:Upstream-Version"} = $version;
+$substvar{"dpkg:Upstream-Version"} =~ s/-[^-]+$//;
 
 for $_ (keys %fi) {
     $v= $fi{$_};