From: Russ Allbery <rra@debian.org>
Date: Wed, 5 Mar 2008 03:56:25 +0000 (+0000)
Subject: Update section list and base system definition
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=cfb89afeeaaeca6bf2c0bb35cd7ebc89135419ca;p=debian%2Fdebian-policy.git

Update section list and base system definition

Remove the base section; it's no longer used.  Remove contrib and
non-free sections which probably predate the category/section convention.
Revise the definition of the base system to use priorities instead.
Thanks to Colin Watson for verification and wording suggestions.
Closes #442070.

git-archimport-id: rra@debian.org--lenny/debian-policy--devel--3.7--patch-35
---

diff --git a/debian/changelog b/debian/changelog
index de0ca1d..2283ddd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,9 @@ debian-policy (3.7.4.0) unstable; urgency=low
     Kurt Roeckx, and others                                  (Closes: #392362).
   * Bug fix: "Homepage field in debian/control undocumented", thanks to
     Mario Iseli                                              (Closes: #452105).
+  * Bug fix: "Policy inconsistent with reality: base subsection no longer
+    used", thanks to Magnus Holmgren, Bernd Zeimetz, and Colin Watson
+                                                             (Closes: #442070).
   * Bug fix: "Examples of dpkg frontends should mention apt now", thanks
     to Josh Triplett                                         (Closes: #455602).
   * Bug fix: "Minor typos and wording suggestions", thanks to Michael
diff --git a/policy.sgml b/policy.sgml
index e8ea2e4..d1be622 100644
--- a/policy.sgml
+++ b/policy.sgml
@@ -640,14 +640,14 @@
 	<p>
 	  The Debian archive maintainers provide the authoritative
 	  list of sections.  At present, they are:
-	  <em>admin</em>, <em>base</em>, <em>comm</em>,
-	  <em>contrib</em>, <em>devel</em>, <em>doc</em>,
+	  <em>admin</em>, <em>comm</em>,
+	  <em>devel</em>, <em>doc</em>,
 	  <em>editors</em>, <em>electronics</em>, <em>embedded</em>,
 	  <em>games</em>, <em>gnome</em>, <em>graphics</em>,
 	  <em>hamradio</em>, <em>interpreters</em>, <em>kde</em>,
 	  <em>libs</em>, <em>libdevel</em>, <em>mail</em>,
 	  <em>math</em>, <em>misc</em>, <em>net</em>, <em>news</em>,
-	  <em>non-free</em>, <em>oldlibs</em>,
+	  <em>oldlibs</em>,
 	  <em>otherosfs</em>, <em>perl</em>, <em>python</em>,
 	  <em>science</em>, <em>shells</em>,
 	  <em>sound</em>, <em>tex</em>, <em>text</em>,
@@ -1078,15 +1078,15 @@
 	<p>
 	  The <tt>base system</tt> is a minimum subset of the Debian
 	  GNU/Linux system that is installed before everything else
-	  on a new system. Thus, only very few packages are allowed
-	  to go into the <tt>base</tt> section to keep the required
-	  disk usage very small.
+	  on a new system. Only very few packages are allowed to form
+	  part of the base system, in order to keep the required disk
+	  usage very small.
 	</p>
 
 	<p>
-	  Most of these packages will have the priority value
-	  <tt>required</tt> or at least <tt>important</tt>, and many
-	  of them will be tagged <tt>essential</tt> (see below).
+	  The base system consists of all those packages with priority
+	  <tt>required</tt> or <tt>important</tt>. Many of them will
+	  be tagged <tt>essential</tt> (see below).
 	</p>
       </sect>
 
diff --git a/upgrading-checklist.html b/upgrading-checklist.html
index a6d6742..264e6a9 100644
--- a/upgrading-checklist.html
+++ b/upgrading-checklist.html
@@ -54,6 +54,9 @@ picking your way through this list.
 
 <pre>
 3.7.4.0                        unreleased
+     * The base section has been removed.  contrib and non-free have been
+       removed from the section list; they are only categories.  The base
+       system is now defined by priority.                        [2.4, 3.7]
      * Debian packages should not use convience copies of code from other
        packages unless the included package is explicitly intended to be
        used that way.                                            [4.13]