Properly override Homepage field from binary package stanzas

diff --git a/ChangeLog b/ChangeLog
index ee02dd5a99f1bd1de885afca4f41cf42582b111e..0e9b48d5a3ed71086097e7bc7973d81dc18da9e8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2007-09-05  Guillem Jover  <guillem@debian.org>
+
+       * scripts/dpkg-gencontrol.pl: Properly override Homepage field from
+       binary package stanzas.
+
 2007-08-31  Guillem Jover  <guillem@debian.org>
 
        * dpkg-deb/build.c (arbitrary_fields): Add Tag.

diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 92052fc83758875e5bb37fdda241a8b2690c5a0a..c75633873a795feac8e2ba8cb4942742986361b4 100755 (executable)
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -146,8 +146,11 @@ for $_ (keys %fi) {
 
     if (s/^C //) {
 #print STDERR "G key >$_< value >$v<\n";
-       if (m/^(Origin|Bugs|Maintainer|Homepage)$/) {
+       if (m/^(Origin|Bugs|Maintainer)$/) {
            $f{$_} = $v;
+       } elsif (m/^Homepage$/) {
+           # Binary package stanzas can override these fields
+           $f{$_} = $v if !defined($f{$_});
        } elsif (m/^Source$/) {
            setsourcepackage($v);
        }