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

ChangeLog

@@ -1,3 +1,22 @@
+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.
+	(known_arbitrary_field): New function.
+	(do_build): Call known_arbitrary_field to not warn on known arbitrary
+	fields.
+	* scripts/dpkg-genchanges.pl: Ignore Homepage field.
+	* scripts/dpkg-gencontrol.pl: Parse Homepage from source package
+	stanza.
+	(@control_fields): Add Homepage.
+	* scripts/dpkg-scanpackages.pl (@fieldpri): Add Homepage.
+	* scripts/dpkg-source.pl: Parse Homepage from source package stanza.
+	(@dsc_fields): Add Homepage.
+
 2007-08-18  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-divert.pl (infol): Check if parameters are defined

THANKS

@@ -12,7 +12,7 @@ Charles Briscoe-Smith <cpbs@debian.org>
 Christian Haggstrom <chm@c00.info>
 Christophe Le Bars <clebars@teaser.fr>
 Colin Plumb <colin@nyx.net>
-Colin Watson <cjw44@flatline.org.uk>
+Colin Watson <cjwatson@debian.org>
 Dan Gohman <gohmandj@mrs.umn.edu>
 Daniel Jacobowitz <dan@debian.org>
 Darren Stalder <torin@daft.com>

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
@@ -37,6 +37,7 @@ dpkg (1.14.6) UNRELEASED; urgency=low
     Thanks to Ian Jackson.
   * Fix perl warnings:
     - When removing a non diverted file with dpkg-divert. Closes: #438416
+  * Implement support for Homepage field. Closes: #142324
 
   [ Updated scripts translations ]
   * French (Frédéric Bothamy, Christian Perrier).

dpkg-deb/build.c

@@ -56,6 +56,21 @@ struct _finfo {
   struct _finfo* next;
 };
 
+const char *arbitrary_fields[]= {
+  "Homepage",
+  NULL
+};
+
+static int known_arbitrary_field(const struct arbitraryfield *field) {
+  const char **known;
+
+  for (known= arbitrary_fields; *known; known++)
+    if (strcasecmp(field->name, *known) == 0)
+      return 1;
+
+  return 0;
+}
+
 /* Do a quick check if vstring is a valid versionnumber. Valid in this case
  * means it contains at least one digit. If an error is found increment
  * *errs.
@@ -223,6 +238,9 @@ void do_build(const char *const *argv) {
       warns++;
     }
     for (field= checkedinfo->available.arbs; field; field= field->next) {
+      if (known_arbitrary_field(field))
+        continue;
+
       fprintf(stderr, _("warning, `%s' contains user-defined field `%s'\n"),
               controlfile, field->name);
       warns++;

man/ChangeLog

@@ -1,3 +1,12 @@
+2007-08-25  Peter Karlsson  <peterk@debian.org>
+
+	* po/sv.po: Updated to 1285t.
+
+2007-08-20  Guillem Jover  <guillem@debian.org>
+
+	* deb-control.5: Document Homepage field.
+	* dpkg-query.1: Document Homepage as a recognized field.
+
 2007-08-18  Guillem Jover  <guillem@debian.org>
 
 	* po/dpkg-man.pot: Regenerated.

man/deb-control.5

@@ -85,6 +85,9 @@ etc. Note that the
 option is meant for packages that are architecture independent. Some examples
 of this are shell and Perl scripts, and documentation.
 .TP
+.BR Homepage: " <url>"
+The upstream project home page URL.
+.TP
 .BR Source: " <source name>"
 The name of the source package that this binary package came from, if
 different than the name of the package itself.

man/dpkg-query.1

@@ -109,6 +109,7 @@ alignment will be used. The following \fIfield\fRs are recognised:
     \fBEnhances\fP
     \fBEssential\fP
     \fBFilename\fP
+    \fBHomepage\fP
     \fBInstalled\-Size\fP
     \fBMD5sum\fP
     \fBMSDOS\-Filename\fP

man/po/sv.po

@@ -928,23 +928,22 @@ msgstr ""
 
 # type: TP
 #: ../../man/deb-control.5:138
-#, fuzzy, no-wrap
+#, no-wrap
 msgid "B<Breaks:> E<lt>package listE<gt>"
-msgstr "B<Replaces:> E<lt>paketlistaE<gt>"
+msgstr "B<Breaks:> E<lt>paketlistaE<gt>"
 
 # type: Plain text
 #: ../../man/deb-control.5:146
-#, fuzzy
 msgid ""
 "Lists packages that this one breaks, for example by exposing bugs when the "
 "named packages rely on this one. The package maintenance software will not "
 "allow broken packages to be configured; generally the resolution is to "
 "upgrade the packages named in a B<Breaks> field."
 msgstr ""
-"Listar paket som är i konflikt (krockar) med detta, till exempel genom att "
-"innehålla filer med samma namn. Pakethanteringsprogramvaran tillåter inte "
-"två sådana paket att vara installerade samtidigt. Två paket med inbördes "
-"konflikt bör innehålla en B<Conflicts>-rad med varandras namn."
+"Listar paket som förstörs av detta, till exempel genom att lyfta fram "
+"fel när det namngivna paketet beror på detta. Pakethanteringsprogramvaran "
+"tillåter inte att förstörda paket konfigureras; problemet löses "
+"vanligtvis genom att uppgradera paketen som namnges i ett B<Breaks>-fält."
 
 # type: TP
 #: ../../man/deb-control.5:146
@@ -2637,7 +2636,7 @@ msgstr ""
 # type: Plain text
 #: ../../man/dpkg.1:377
 msgid "B<breaks>: Install, even if this would break another package."
-msgstr ""
+msgstr "B<breaks>: Installera, även om det skulle förstöra ett annat paket."
 
 # type: Plain text
 #: ../../man/dpkg.1:381
@@ -6360,7 +6359,7 @@ msgstr ""
 
 # type: Plain text
 #: ../../man/dpkg-query.1:130
-#, fuzzy, no-wrap
+#, no-wrap
 msgid ""
 "    B<Architecture>\n"
 "    B<Bugs>\n"
@@ -6397,6 +6396,7 @@ msgstr ""
 "    B<Conffiles>\n"
 "    B<Config-Version>\n"
 "    B<Conflicts>\n"
+"    B<Breaks>\n"
 "    B<Depends>\n"
 "    B<Description>\n"
 "    B<Enhances>\n"

po/ChangeLog

@@ -1,3 +1,7 @@
+2007-08-25  Peter Karlsson  <peterk@debian.org>
+
+	* sv.po: Updated to 929t.
+
 2007-08-18  Guillem Jover  <guillem@debian.org>
 
 	* dpkg.pot: Regenerated.

po/sv.po

@@ -5,10 +5,10 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: dpkg 1.13.11.0.1\n"
+"Project-Id-Version: dpkg 1.14.6\n"
 "Report-Msgid-Bugs-To: debian-dpkg@lists.debian.org\n"
 "POT-Creation-Date: 2007-08-18 03:58+0300\n"
-"PO-Revision-Date: 2007-07-29 11:58+0100\n"
+"PO-Revision-Date: 2007-08-25 16:04+0100\n"
 "Last-Translator: Peter Karlsson <peterk@debian.org>\n"
 "Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
 "MIME-Version: 1.0\n"
@@ -795,14 +795,14 @@ msgid "failed to read `%s' at line %d"
 msgstr "kunde inte öppna \"%s\" på rad %d"
 
 #: lib/parsehelp.c:41
-#, fuzzy, c-format
+#, c-format
 msgid "warning, in file `%.255s' near line %d"
-msgstr "%s: i fil \"%.255s\" nära rad %d"
+msgstr "varning, i fil \"%.255s\" nära rad %d"
 
 #: lib/parsehelp.c:44
-#, fuzzy, c-format
+#, c-format
 msgid "parse error, in file `%.255s' near line %d"
-msgstr "%s: i fil \"%.255s\" nära rad %d"
+msgstr "tolkningsfel, i fil \"%.255s\" nära rad %d"
 
 #: lib/parsehelp.c:48
 #, c-format
@@ -899,9 +899,9 @@ msgid "error setting permissions of `%.255s'"
 msgstr "fel när behörighet för \"%.255s\" skulle ställas in"
 
 #: src/archives.c:339
-#, fuzzy, c-format
+#, c-format
 msgid "failed to stat (dereference) existing symlink `%.250s'"
-msgstr "kunde inte ställa in körrättigheter på \"%.250s\""
+msgstr "kunde inte ta status på (avreferera) befintlig symbolisk länk \"%.250s\""
 
 #: src/archives.c:360
 #, c-format
@@ -909,24 +909,24 @@ msgid ""
 "failed to stat (dereference) proposed new symlink target `%.250s' for "
 "symlink `%.250s'"
 msgstr ""
+"kunde inte ta status på (avreferera) föreslaget nytt mål \"%.250s\" "
+"för symbolisk länk \"%.250s\""
 
-# ??!?!?
 #: src/archives.c:411
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "trying to overwrite `%.250s', which is the diverted version of `"
 "%.250s' (package: %.100s)"
 msgstr ""
 "försökte skriva över \"%.250s\", vilket är den omdirigerade varianten av "
-"\"%.250s\"%.10s%.100s%.10s"
+"\"%.250s\" (paket: %.100s)"
 
-# ??!?!?
 #: src/archives.c:417
-#, fuzzy, c-format
+#, c-format
 msgid "trying to overwrite `%.250s', which is the diverted version of `%.250s'"
 msgstr ""
 "försökte skriva över \"%.250s\", vilket är den omdirigerade varianten av "
-"\"%.250s\"%.10s%.100s%.10s"
+"\"%.250s\""
 
 #: src/archives.c:440
 #, c-format
@@ -1059,61 +1059,62 @@ msgid "unable to install new version of `%.255s'"
 msgstr "kunde inte installera ny version av \"%.255s\""
 
 #: src/archives.c:853
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "dpkg: warning - ignoring dependency problem with %s:\n"
 "%s"
 msgstr ""
-"dpkg: varning - ignorerar beroendeproblem vid borttagning av %s:\n"
+"dpkg: varning - ignorerar beroendeproblem med %s:\n"
 "%s"
 
 #: src/archives.c:860
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "dpkg: warning - considering deconfiguration of essential\n"
 " package %s, to enable %s.\n"
 msgstr ""
 "dpkg: varning - funderar på att avkonfigurera det systemkritiska\n"
-" paketet %s för att kunna ta bort %s.\n"
+" paketet %s för att aktivera %s.\n"
 
 #: src/archives.c:864
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "dpkg: no, %s is essential, will not deconfigure\n"
 " it in order to enable %s.\n"
 msgstr ""
 "dpkg: nej, %s är systemkritiskt, kommer inte att avkonfigurera\n"
-" det för att möjliggöra borttagning av %s.\n"
+" det för att aktivera %s.\n"
 
 #: src/archives.c:878
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "dpkg: no, cannot proceed with %s (--auto-deconfigure will help):\n"
 "%s"
 msgstr ""
-"dpkg: nej, kan inte ta bort %s (--auto-deconfigure hjälper):\n"
+"dpkg: nej, kan fortsätta med %s (--auto-deconfigure hjälper):\n"
 "%s"
 
 #: src/archives.c:888
-#, fuzzy, c-format
+#, c-format
 msgid "removal of %.250s"
-msgstr "läsfel i %.250s"
+msgstr "borttagning av %.250s"
 
 #: src/archives.c:915
-#, fuzzy, c-format
+#, c-format
 msgid "installation of %.250s"
-msgstr "kunde inte installera ny version av \"%.255s\""
+msgstr "installation av \"%.255s\""
 
 #: src/archives.c:916
-#, fuzzy, c-format
+#, c-format
 msgid ""
 "dpkg: considering deconfiguration of %s, which would be broken by %s ...\n"
-msgstr "dpkg: funderar på att ta bort %s till förmån för %s ...\n"
+msgstr ""
+"dpkg: funderar på att avkonfigurera %s, vilket skulle förstöras av %s ...\n"
 
 #: src/archives.c:923
-#, fuzzy, c-format
+#, c-format
 msgid "dpkg: yes, will deconfigure %s (broken by %s).\n"
-msgstr "dpkg: ja, kommer att ta bort %s till förmån för %s.\n"
+msgstr "dpkg: ja, kommer att avkonfigurera %s (förstörs av %s).\n"
 
 #: src/archives.c:927 src/archives.c:1048
 #, c-format
@@ -1125,9 +1126,9 @@ msgstr ""
 "%s"
 
 #: src/archives.c:935
-#, fuzzy, c-format
+#, c-format
 msgid "dpkg: warning - ignoring breakage, may proceed anyway !\n"
-msgstr "dpkg: varning - ignorerar konflikt, kan ändå fortsätta!\n"
+msgstr "dpkg: varning - ignorerar förstörelse, kan ändå fortsätta!\n"
 
 #: src/archives.c:941
 #, c-format
@@ -1135,11 +1136,13 @@ msgid ""
 "installing %.250s would break %.250s, and\n"
 " deconfiguration is not permitted (--auto-deconfigure might help)"
 msgstr ""
+"installation av %.250s skulle förstöra %.250s, och\n"
+" avkonfigurering tillåts inte (--auto-deconfigure kanske hjälper)"
 
 #: src/archives.c:945
 #, c-format
 msgid "installing %.250s would break existing software"
-msgstr ""
+msgstr "installation av %.250s skulle förstöra befintliga program"
 
 #: src/archives.c:978
 #, c-format
@@ -2678,19 +2681,18 @@ msgid "  Package %s is not installed.\n"
 msgstr "  Paketet %s är ej installerat.\n"
 
 #: src/packages.c:362
-#, fuzzy, c-format
+#, c-format
 msgid " %s (%s) breaks %s and is %s.\n"
-msgstr "  %.250s tillhandahåller %.250s och är %s.\n"
+msgstr " %s (%s) förstör %s och är %s.\n"
 
 #: src/packages.c:370
-#, fuzzy, c-format
 msgid "  %s (%s) provides %s.\n"
-msgstr "%s (underprocess): %s\n"
+msgstr "  %s (%s) tillhandahåller %s.\n"
 
 #: src/packages.c:375
-#, fuzzy, c-format
+#, c-format
 msgid "  Version of %s to be configured is %s.\n"
-msgstr "  Versionen av %s på systemet är %s.\n"
+msgstr "  Versionen av %s som skall konfigureras är %s.\n"
 
 #: src/packages.c:467
 msgid " depends on "
@@ -2819,14 +2821,14 @@ msgid "error trying to open %.250s"
 msgstr "fel vid öppning av %.250s"
 
 #: src/processarc.c:405
-#, fuzzy, c-format
+#, c-format
 msgid "De-configuring %s, to allow removal of %s ...\n"
-msgstr "Avkonfigurerar %s så att vi kan ta bort %s ...\n"
+msgstr "Avkonfigurerar %s, så att vi kan ta bort %s ...\n"
 
 #: src/processarc.c:408
-#, fuzzy, c-format
+#, c-format
 msgid "De-configuring %s ...\n"
-msgstr "Tar bort %s ...\n"
+msgstr "Avkonfigurerar %s ...\n"
 
 #: src/processarc.c:479
 #, c-format
@@ -2983,24 +2985,24 @@ msgid "No packages found matching %s.\n"
 msgstr "Inga paket matchar %s.\n"
 
 #: src/query.c:254
-#, fuzzy, c-format
+#, c-format
 msgid "diversion by %s from: %s\n"
-msgstr "omdirigerat av %s till: %s\n"
+msgstr "omdirigering av %s från: %s\n"
 
 #: src/query.c:256
-#, fuzzy, c-format
+#, c-format
 msgid "diversion by %s to: %s\n"
-msgstr "omdirigerat av %s till: %s\n"
+msgstr "omdirigering av %s till: %s\n"
 
 #: src/query.c:259
-#, fuzzy, c-format
+#, c-format
 msgid "local diversion from: %s\n"
-msgstr "lokal omdirigering"
+msgstr "lokal omdirigering från: %s\n"
 
 #: src/query.c:260
-#, fuzzy, c-format
+#, c-format
 msgid "local diversion to: %s\n"
-msgstr "lokalt omdirigerad till: %s\n"
+msgstr "lokal omdirigering till: %s\n"
 
 #: src/query.c:285
 msgid "--search needs at least one file name pattern argument"

scripts/changelog/debian.pl

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

scripts/dpkg-genchanges.pl

@@ -208,7 +208,7 @@ for $_ (keys %fi) {
 	elsif (m/^Section$|^Priority$/i) { $sourcedefault{$_}= $v; }
 	elsif (m/^Maintainer$/i) { $f{$_}= $v; }
 	elsif (s/^X[BS]*C[BS]*-//i) { $f{$_}= $v; }
-	elsif (m/|^X[BS]+-|^Standards-Version$/i) { }
+	elsif (m/|^X[BS]+-|^Standards-Version$|^Homepage$/i) { }
 	else { &unknown(_g('general section of control info file')); }
     } elsif (s/^C(\d+) //) {
 	my $i = $1;

scripts/dpkg-gencontrol.pl

@@ -23,7 +23,7 @@ textdomain("dpkg-dev");
 
 my @control_fields = (qw(Package Source Version Architecture Essential Origin
                          Bugs Maintainer Installed-Size), @pkg_dep_fields,
-                      qw(Section Priority Description));
+                      qw(Section Priority Homepage Description));
 
 my $controlfile = 'debian/control';
 my $changelogfile = 'debian/changelog';
@@ -146,7 +146,7 @@ for $_ (keys %fi) {
 
     if (s/^C //) {
 #print STDERR "G key >$_< value >$v<\n";
-	if (m/^(Origin|Bugs|Maintainer)$/) {
+	if (m/^(Origin|Bugs|Maintainer|Homepage)$/) {
 	    $f{$_} = $v;
 	} elsif (m/^Source$/) {
 	    setsourcepackage($v);
@@ -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$/) {

scripts/dpkg-scanpackages.pl

@@ -26,7 +26,7 @@ my %kmap= (optional         => 'suggests',
 
 my @fieldpri = (qw(Package Source Version Architecture Essential Origin Bugs
                    Maintainer Installed-Size), @pkg_dep_fields, qw(Filename
-                   Size MD5sum Section Priority Description));
+                   Size MD5sum Section Priority Homepage Description));
 
 # This maps the fields into the proper case
 my %field_case;

scripts/dpkg-source.pl

@@ -76,7 +76,8 @@ our @src_dep_fields;
 textdomain("dpkg-dev");
 
 my @dsc_fields = (qw(Format Source Binary Architecture Version Origin
-                     Maintainer Uploaders Standards-Version), @src_dep_fields);
+                     Maintainer Uploaders Homepage Standards-Version),
+                  @src_dep_fields);
 
 
 # Make sure patch doesn't get any funny ideas
@@ -238,8 +239,9 @@ if ($opmode eq 'build') {
         if (s/^C //) {
 	    if (m/^Source$/i) {
 		setsourcepackage($v);
+	    } elsif (m/^(Standards-Version|Origin|Maintainer|Homepage)$/i) {
+		$f{$_}= $v;
 	    }
-            elsif (m/^(Standards-Version|Origin|Maintainer)$/i) { $f{$_}= $v; }
 	    elsif (m/^Uploaders$/i) { ($f{$_}= $v) =~ s/[\r\n]//g; }
 	    elsif (m/^Build-(Depends|Conflicts)(-Indep)?$/i) {
 		my $dep = parsedep(substvars($v),1);