Merge branch 'master' of ssh://git.debian.org/git/dpkg/dpkg

debian/changelog

@@ -1,8 +1,18 @@
-dpkg (1.16.7) UNRELEASED; urgency=low
+dpkg (1.16.8) UNRELEASED; urgency=low
+
+  *
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Mon, 02 Jul 2012 21:37:00 +0200
+
+dpkg (1.16.7) unstable; urgency=low
 
   [ Guillem Jover ]
   * Fix bogus dpkg-query --control-show badusage() strings.
 
+  [ Raphaël Hertzog ]
+  * Fix dpkg-gencontrol to correctly compute the source version
+    in the case of "old-style" bin-nmus. Closes: #679959
+
   [ Updated dselect translations ]
   * Catalan (Guillem Jover).
   * French (Christian Perrier).
@@ -10,8 +20,9 @@ dpkg (1.16.7) UNRELEASED; urgency=low
   * Swedish (Peter Krefting).
 
   [ Updated programs translations ]
-  * Italian (Milo Casagrande).
   * French (Christian Perrier).
+  * German (Sven Joachim).
+  * Italian (Milo Casagrande).
   * Swedish (Peter Krefting).
 
   [ Updated man page translations ]
@@ -22,7 +33,7 @@ dpkg (1.16.7) UNRELEASED; urgency=low
   * Swedish (Peter Krefting).
   * French (Christian Perrier).
 
- -- Guillem Jover <guillem@debian.org>  Sat, 30 Jun 2012 22:17:55 +0200
+ -- Raphaël Hertzog <hertzog@debian.org>  Mon, 02 Jul 2012 21:16:12 +0200
 
 dpkg (1.16.6) unstable; urgency=low
 

scripts/dpkg-gencontrol.pl

@@ -161,6 +161,10 @@ $substvars->load("debian/substvars") if -e "debian/substvars" and not $substvars
 my $control = Dpkg::Control::Info->new($controlfile);
 my $fields = Dpkg::Control->new(type => CTRL_PKG_DEB);
 
+# Old-style bin-nmus change the source version submitted to
+# set_version_substvars()
+$sourceversion = $substvars->get("source:Version");
+
 my $pkg;
 
 if (defined($oppackage)) {