Просмотр исходного кода

Properly override Homepage field from binary package stanzas

Guillem Jover лет назад: 19
Родитель
Сommit
da24c2f743
2 измененных файлов с 9 добавлено и 1 удалено
  1. 5 0
      ChangeLog
  2. 4 1
      scripts/dpkg-gencontrol.pl

+ 5 - 0
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.

+ 4 - 1
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);
 	}