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

ChangeLog

@@ -1,3 +1,8 @@
+2007-08-24  Guillem Jover  <guillem@debian.org>
+
+	* scripts/dpkg-gencontrol.pl: Allow a package stanza to override the
+	Homepage field from the source stanza.
+
 2007-08-20  Guillem Jover  <guillem@debian.org>
 
 	* dpkg-deb/build.c (arbitrary_fields): New variable.

debian/changelog

@@ -11,7 +11,7 @@ dpkg (1.14.6) UNRELEASED; urgency=low
     - Unify ellipsis, argument separator, and remove redundant program name
       preceding the options.
     - Substitute 'FILES' header with 'SEE ALSO' in dpkg-buildpackage(1),
-      and remove leftover string from man page split.
+      and remove leftover string from man page split. Closes: #439306
     - Split option descriptions so that it gets easier to distinguish.
     - Unify author and copyright information formatting.
   * Move variables automatically modified at build time for the perl scripts

scripts/changelog/debian.pl

@@ -1,8 +1,4 @@
 #!/usr/bin/perl
-#
-# Options:
-#  -v<version>
-#   changes since <version>
 
 use strict;
 use warnings;

scripts/dpkg-gencontrol.pl

@@ -157,7 +157,7 @@ for $_ (keys %fi) {
         else { $_ = "C $_"; &unknown(_g('general section of control info file')); }
     } elsif (s/^C$myindex //) {
 #print STDERR "P key >$_< value >$v<\n";
-        if (m/^(Package|Description|Essential|Optional)$/) {
+        if (m/^(Package|Description|Homepage|Essential|Optional)$/) {
             $f{$_}= $v;
         } elsif (exists($pkg_dep_fields{$_})) {
         } elsif (m/^Section$|^Priority$/) {