[Reproducible-commits] [dpkg] 45/90: dpkg-gencontrol: Add the correct filename to debian/files

[Jérémy Bobbio]

This is an automated email from the git hooks/post-receive script.

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 1063e2e684a5e2fcc71608217c9171c9f2bdee0c
Author: Guillem Jover <guillem at debian.org>
Date:   Mon Jun 29 21:14:19 2015 +0200

    dpkg-gencontrol: Add the correct filename to debian/files
    
    When overriding the Package field, we have to take that into account
    while generating the filename to add to debian/files, as the field
    overrides happen after all field values have been computed.
    
    Reported-by: Niels Thykier <niels at thykier.net>
---
 debian/changelog           | 3 +++
 scripts/dpkg-gencontrol.pl | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6c37dff..de3a9c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ dpkg (1.18.2) UNRELEASED; urgency=low
   [ Guillem Jover ]
   * Fix plural form translations for single plural languages. Closes: #790025
   * Add new dpkg-buildpackage -J option, which is a safe version of -j.
+  * Fix dpkg-gencontrol to add correct binary filename to debian/files,
+    even when overriding the Package field value with the -D option.
+    Reported by Niels Thykier <niels at thykier.net>.
   * Perl modules:
     - Remove non-functional timezone name support from
       Dpkg::Changelog::Entry::Debian.
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 299f1f0..d537a61 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -328,7 +328,7 @@ if ($pkg_type eq 'udeb') {
 }
 
 my $sourcepackage = get_source_package();
-my $binarypackage = $fields->{'Package'};
+my $binarypackage = $override{'Package'} // $fields->{'Package'};
 my $verdiff = $binaryversion ne $sourceversion;
 if ($binarypackage ne $sourcepackage || $verdiff) {
     $fields->{'Source'} = $sourcepackage;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git