From 96ccf6858215597682b9385ca1b370d21dcc532b Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Fri, 03 Aug 2012 21:19:05 -0400
Subject: Remove Source and Package control fields.

---
diff --git a/specs/source-package-format-2.0.txt b/specs/source-package-format-2.0.txt
index 321e64b..77734c9 100644
--- a/specs/source-package-format-2.0.txt
+++ b/specs/source-package-format-2.0.txt
@@ -61,6 +61,11 @@ source package format:
   * The version identifier syntax now encodes information about source archive
     repacks and non-trunk distribution uploads.
     - The syntax has been made strict to make parsing simple and deterministic.
+  * The `Source` and `Package` control fields have been removed, as the
+    information they provided is provided elsewhere.
+    - 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.
 
 
 5.  Rationale
@@ -190,6 +195,11 @@ After execution of the `config` file, for each binary package there must exist a
 directory named `<binpkg>.pkg`, where `<binpkg>` is the name of the binary
 package.
 
+Binary package names may only consist of lowercase Latin letters, digits, plus
+and minus signs, and periods.  Names must be at least two characters long and
+must start with either a letter or a digit.  (A regular expression for this is
+`[a-z0-9][a-z0-9+.-]+`.)
+
 This directory contains metadata and scripts for a binary package.
 
 10.2.  `<binpkg>.pkg/control`
@@ -372,7 +382,10 @@ format:
     [zero or more blank lines]
      -- maintainer  date
 
-`package` is the source package name.
+`package` is the source package name.  Source package names may only consist of
+lowercase Latin letters, digits, plus and minus signs, and periods.  Names must
+be at least two characters long and must start with either a letter or a digit.
+(A regular expression for this is `[a-z0-9][a-z0-9+.-]+`.)
 
 `version` is the source package version.  See section 17 for the syntax of
 source package version identifiers.
@@ -468,12 +481,6 @@ of one or more digits, the first of which must be greater than or equal to `1`.
 
 The fields in the source package metadata are:
 
-  * `Source` (required)  
-    The name of the source package.  Source package names may only consist of
-    lowercase Latin letters, digits, plus and minus signs, and periods.  Names
-    must be at least two characters long and must start with either a letter or
-    a digit.
-
   * `Maintainer` (required)  
     The name and e-mail address of the package maintainer.  This field must
     follow the syntax of the `mailbox` symbol in RFC 5322 section 3.4.
@@ -493,12 +500,6 @@ The fields in the source package metadata are:
 
 The fields in the binary package metadata are:
 
-  * `Package` (required)  
-    The name of the binary package.  Binary package names may only consist of
-    lowercase Latin letters, digits, plus and minus signs, and periods.  Names
-    must be at least two characters long and must start with either a letter or
-    a digit.
-
   * `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:
--
cgit v0.9.1