The following commit has been merged in the master branch:
commit 8bbd76cc98360c20ff8ca660ab1d53234608ff92
Author: Raphaël Hertzog <hert...@debian.org>
Date: Sat May 28 15:12:58 2011 +0200
dpkg-source: reenable the Package-List field
But drop the Architecture column since we have no clear use case yet. It
can always be added later on. Parsers should treat the field as an
extendable one. They shall ignore supplementary columns that they do
not know.
Also drop the source line, it's not needed since the dsc file describes
the source package already (source section and priority are not currently
exported in dedicated fields but they can be added later if we start
having a need for this information).
diff --git a/debian/changelog b/debian/changelog
index c487045..16aa463 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -21,6 +21,10 @@ dpkg (1.16.1) UNRELEASED; urgency=low
internal files in /var/lib/dpkg/info/triggers/. Closes: #525160
* Avoid a perl warning in dpkg-gensymbols when no symbols file has been
generated (because it would have been empty). Closes: #626684
+ * Reenable the Package-List field but drop the Architecture column since we
+ have no clear use case yet. It can always be added later on.
+ Also drop the source line since it duplicates other fields.
+ Closes: #619131
[ Guillem Jover ]
* Install deb-src-control(5) man pages in dpkg-dev. Closes: #620520
diff --git a/scripts/dpkg-source.pl b/scripts/dpkg-source.pl
index 2419ff5..8d23806 100755
--- a/scripts/dpkg-source.pl
+++ b/scripts/dpkg-source.pl
@@ -254,9 +254,7 @@ if ($options{'opmode'} =~
/^(-b|--print-format|--(before|after)-build)$/) {
my $prio = $pkg->{'Priority'} || $src_prio;
my $type = $pkg->{'Package-Type'} ||
$pkg->get_custom_field('Package-Type') || 'deb';
- my $arch = $pkg->{'Architecture'};
- $arch =~ s/\s+/,/g;
- push @pkglist, sprintf("%s %s %s %s %s", $p, $type, $sect, $prio,
$arch);
+ push @pkglist, sprintf("%s %s %s %s", $p, $type, $sect, $prio);
push(@binarypackages,$p);
foreach $_ (keys %{$pkg}) {
my $v = $pkg->{$_};
@@ -295,11 +293,7 @@ if ($options{'opmode'} =~
/^(-b|--print-format|--(before|after)-build)$/) {
}
}
$fields->{'Architecture'} = join(' ', @sourcearch);
- $fields->{'Package-List'} = sprintf("\n%s source %s %s %s", $sourcepackage,
- $src_sect, $src_prio,
- join(',', @sourcearch));
- $fields->{'Package-List'} .= "\n" . join("\n", sort @pkglist);
- delete $fields->{'Package-List'};
+ $fields->{'Package-List'} = "\n" . join("\n", sort @pkglist);
# Scan fields of dpkg-parsechangelog
foreach $_ (keys %{$changelog}) {
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
