Author: djpig
Date: 2006-02-18 18:19:06 +0000 (Sat, 18 Feb 2006)
New Revision: 162
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/dpkg-gencontrol.pl
Log:
Handle architectures in all dependency fields in debian/control,
even those of binary packages. Closes: #252657, #324741, #347819
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2006-02-18 18:06:58 UTC (rev 161)
+++ trunk/ChangeLog 2006-02-18 18:19:06 UTC (rev 162)
@@ -1,5 +1,10 @@
2006-02-18 Frank Lichtenheld <[EMAIL PROTECTED]>
+ * scripts/dpkg-gencontrol.pl: Call parsedep
+ with use_arch and reduce_arch parameters to
+ allow using architectures in dependency
+ fields of binary packages in debian/control.
+
* scripts/dpkg-gencontrol.pl: Fix handling of
debian/files when architecture is set via -D
command line option. The value override was
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2006-02-18 18:06:58 UTC (rev 161)
+++ trunk/debian/changelog 2006-02-18 18:19:06 UTC (rev 162)
@@ -2,6 +2,8 @@
[ Frank Lichtenheld ]
* Fix handling of -DArchitecure=foo in dpkg-gencontrol. Closes: #251911
+ * Handle architectures in all dependency fields in debian/control,
+ even those of binary packages. Closes: #252657, #324741, #347819
-- Frank Lichtenheld <[EMAIL PROTECTED]> Sat, 18 Feb 2006 19:01:24 +0100
Modified: trunk/scripts/dpkg-gencontrol.pl
===================================================================
--- trunk/scripts/dpkg-gencontrol.pl 2006-02-18 18:06:58 UTC (rev 161)
+++ trunk/scripts/dpkg-gencontrol.pl 2006-02-18 18:19:06 UTC (rev 162)
@@ -180,7 +180,7 @@
} elsif (s/^C$myindex //) {
if (m/^(Package|Description|Essential|Optional)$/) {
} elsif (exists($pkg_dep_fields{$_})) {
- my $dep = parsedep(substvars($v));
+ my $dep = parsedep(substvars($v), 1, 1);
&error("error occoured while parsing $_") unless defined $dep;
$f{$_}= showdep($dep, 0);
} elsif (m/^Section$|^Priority$/) {
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
