Przeglądaj źródła

Add Multi-Arch to the list of known binary package fields for dpkg-dev

Steve Langasek 17 lat temu
rodzic
commit
d0d808250a
3 zmienionych plików z 4 dodań i 2 usunięć
  1. 2 0
      debian/changelog
  2. 1 1
      scripts/Dpkg/Fields.pm
  3. 1 1
      scripts/dpkg-gencontrol.pl

+ 2 - 0
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 --pre-invoke and --post-invoke hooks in dpkg.
   * Add new --control-path command to dpkg-query.
   * Add new --control-path command to dpkg-query.
   * Use ohshit on bad version syntax in --compare-versions.
   * 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 <vorlon@debian.org>.
 
 
   [ Raphael Hertzog ]
   [ Raphael Hertzog ]
   * Replace install-info by a wrapper around GNU's install-info. The wrapper
   * Replace install-info by a wrapper around GNU's install-info. The wrapper

+ 1 - 1
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_src_fields{$_} = 1 foreach (@src_dep_fields);
 $control_pkg_fields{$_} = 1 foreach (qw(Architecture Bugs Description Essential
 $control_pkg_fields{$_} = 1 foreach (qw(Architecture Bugs Description Essential
     Homepage Installer-Menu-Item Kernel-Version Package Package-Type
     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);
 $control_pkg_fields{$_} = 1 foreach (@pkg_dep_fields);
 
 
 our $control_src_field_regex = "(?:" . join("|", keys %control_src_fields) . ")";
 our $control_src_field_regex = "(?:" . join("|", keys %control_src_fields) . ")";

+ 1 - 1
scripts/dpkg-gencontrol.pl

@@ -22,7 +22,7 @@ my @control_fields = (qw(Package Package-Type Source Version Kernel-Version
                          Architecture Subarchitecture Installer-Menu-Item
                          Architecture Subarchitecture Installer-Menu-Item
                          Essential Origin Bugs Maintainer Installed-Size),
                          Essential Origin Bugs Maintainer Installed-Size),
                       @pkg_dep_fields,
                       @pkg_dep_fields,
-                      qw(Section Priority Homepage Description Tag));
+                      qw(Section Priority Multi-Arch Homepage Description Tag));
 
 
 my $controlfile = 'debian/control';
 my $controlfile = 'debian/control';
 my $changelogfile = 'debian/changelog';
 my $changelogfile = 'debian/changelog';