Simplify and update Architecture description.

  * Platform names are no longer specified in the Architecture field.
  * Wildcard binary architecture strings are now supported.

1 files changed, 17 insertions, 22 deletions

diff --git a/specs/source-package-format-2.0.txt b/specs/source-package-format-2.0.txt
index a0db8f0..b742212 100644
--- a/specs/source-package-format-2.0.txt
+++ b/specs/source-package-format-2.0.txt
@@ -66,6 +66,8 @@ source package format:
     - Source package names are now given only in the `changelog` file.
     - Binary package names are now given only in the names of `<binpkg>.pkg/`
       directories.
+  * Platform names are no longer specified in the `Architecture` field.
+  * Wildcard binary architecture strings are now supported.
 
 
 5.  Rationale
@@ -505,28 +507,21 @@ The fields in the source package metadata are:
 The fields in the binary package metadata are:
 
   * `Architecture` (required)  
-    The names of the architectures for which this package is built.  The list of
-    names may consist of values selected from the following:
-
-      - A three-tuple binary architecture name to specify that the package can
-        be built for the binary architecture and any application platform.
-      - An application platform architecture name to specify that the package
-        can be built for the application platform and its associated binary
-        architecture.
-
-    Alternatively, the list may consist solely of one of the following values:
-
-      - The string `all` to specify that the package can be built on any binary
-        architecture and any application platform and can then be installed on
-        binary architectures and/or application platforms other than those on
-        which it is built.  This value should be used for packages that provide
-        only architecture- and platform-independent files, such as common shell
-        scripts or data.
-      - The string `any` to specify that the package can be built for any binary
-        architecture and any application platform.  This value should be used
-        for packages that provide architecture- and/or platform-dependent files
-        that can be built and run on any architecture and platform, such as
-        portably-written C programs.
+    A list of architectures for which this package may be built.  The value may
+    be any one of the following:
+
+    - The string `all` to specify that all of the provided files are
+      architecture-independent;
+    - The string `any` to specify that at least some of the provided files are
+      architecture-dependent; or
+    - A space-separated list of one or more real or wildcard binary architecture
+      strings to specify that at least some of the provided files are only
+      usable on systems of the named binary architecture(s).
+
+    A "wildcard" binary architecture string is one in which one or two
+    components (called "wildcard components") is the string `any`.  It shall be
+    considered to match any real binary architecture string for which the
+    non-wildcard components are equal.
 
   * `Essential` (optional)  
     A flag to indicate whether the package is essential for the functioning of a