Hi again,
the previous patch was originaly for stable and something went wrong
adjusting it to sid. Anyway, below is a corrected patch for dpkg
1.13.16.
----------------------------------------------------------------------
diff -Nru dpkg-1.13.16/debian/changelog dpkg-1.13.16c0.mrvn.1/debian/changelog
--- dpkg-1.13.16/debian/changelog 2006-02-18 18:02:25.000000000 +0100
+++ dpkg-1.13.16c0.mrvn.1/debian/changelog 2006-03-11 15:22:22.000000000
+0100
@@ -1,3 +1,9 @@
+dpkg (1.13.16c0.mrvn.1) unstable; urgency=low
+
+ * dpkg-genchanges: Add support for building for multiple archs at once
+
+ -- Goswin von Brederlow <[EMAIL PROTECTED]> Sat, 11 Mar 2006 14:21:44 +0000
+
dpkg (1.13.16) unstable; urgency=low
* The "not really a brown paper bag needed but it's close" release
diff -Nru dpkg-1.13.16/scripts/dpkg-genchanges.pl
dpkg-1.13.16c0.mrvn.1/scripts/dpkg-genchanges.pl
--- dpkg-1.13.16/scripts/dpkg-genchanges.pl 2006-01-23 05:50:40.000000000
+0100
+++ dpkg-1.13.16c0.mrvn.1/scripts/dpkg-genchanges.pl 2006-03-11
15:35:14.000000000 +0100
@@ -136,6 +136,7 @@
&warn("duplicate files list entry for file $1 (line $.)");
$f2sec{$1}= $5;
$f2pri{$1}= $6;
+ push(@archvalues,$4) unless !$4 || $archadded{$4}++;
push(@fileslistfiles,$1);
} elsif (m/^([-+.0-9a-z]+_[^_]+_([-\w]+)\.[a-z0-9.]+) (\S+) (\S+)$/) {
# A non-deb package
@@ -176,7 +177,10 @@
}
} else {
$p2arch{$p}=$a;
- $f=$p2f{$p};
+ for $one_arch (split(/\s+/, $a)) {
+ next if (!defined($p2f{"$p $one_arch"}));
+ $f=$p2f{"$p $one_arch"};
+ #$f=$p2f{$p};
if (m/^Description$/) {
$v=$` if $v =~ m/\n/;
if ($f =~ m/\.udeb$/) {
@@ -208,6 +212,7 @@
} else {
&unknown("package's section of control info file");
}
+ }
}
} elsif (s/^L //) {
if (m/^Source$/i) {
@@ -244,8 +249,8 @@
&warn("package $pp listed in files list but not in control info");
}
-for $p (keys %p2f) {
- $f= $p2f{$p};
+for $f (keys %f2p) {
+ $p= $f2p{$f};
$sec= $f2seccf{$f}; $sec= $sourcedefault{'Section'} if !length($sec);
if (!length($sec)) { $sec='-'; &warn("missing Section for binary package
$p; using '-'"); }
$sec eq $f2sec{$f} || &error("package $p has section $sec in control file".
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
