The following commit has been merged in the master branch:
commit d0d808250ad40e19ee531e6997d3bf401b7889d5
Author: Steve Langasek <[email protected]>
Date: Sun Aug 30 01:33:54 2009 -0700
Add Multi-Arch to the list of known binary package fields for dpkg-dev
diff --git a/debian/changelog b/debian/changelog
index 5820bbb..3e5f7e7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -48,6 +48,8 @@ dpkg (1.15.4) UNRELEASED; urgency=low
* Add new --pre-invoke and --post-invoke hooks in dpkg.
* Add new --control-path command to dpkg-query.
* Use ohshit on bad version syntax in --compare-versions.
+ * Add Multi-Arch to the list of known binary package fields for dpkg-dev.
+ Thanks to Steve Langasek <[email protected]>.
[ Raphael Hertzog ]
* Replace install-info by a wrapper around GNU's install-info. The wrapper
diff --git a/scripts/Dpkg/Fields.pm b/scripts/Dpkg/Fields.pm
index 90a32ca..c6a37fb 100644
--- a/scripts/Dpkg/Fields.pm
+++ b/scripts/Dpkg/Fields.pm
@@ -23,7 +23,7 @@ $control_src_fields{$_} = 1 foreach (qw(Bugs Dm-Upload-Allowed
$control_src_fields{$_} = 1 foreach (@src_dep_fields);
$control_pkg_fields{$_} = 1 foreach (qw(Architecture Bugs Description Essential
Homepage Installer-Menu-Item Kernel-Version Package Package-Type
- Priority Section Subarchitecture Tag));
+ Priority Section Subarchitecture Tag Multi-Arch));
$control_pkg_fields{$_} = 1 foreach (@pkg_dep_fields);
our $control_src_field_regex = "(?:" . join("|", keys %control_src_fields) .
")";
diff --git a/scripts/dpkg-gencontrol.pl b/scripts/dpkg-gencontrol.pl
index 8e00cd5..8bd952f 100755
--- a/scripts/dpkg-gencontrol.pl
+++ b/scripts/dpkg-gencontrol.pl
@@ -22,7 +22,7 @@ my @control_fields = (qw(Package Package-Type Source Version
Kernel-Version
Architecture Subarchitecture Installer-Menu-Item
Essential Origin Bugs Maintainer Installed-Size),
@pkg_dep_fields,
- qw(Section Priority Homepage Description Tag));
+ qw(Section Priority Multi-Arch Homepage Description
Tag));
my $controlfile = 'debian/control';
my $changelogfile = 'debian/changelog';
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
