Merge branch 'master' into bug23712-rra

diff --git a/debian/changelog b/debian/changelog
index 373e7effb95c14f7b6148c9f6a94607b9e646efd..e4e498ac86638e8c30bbed4d5807b7d24ba283c2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,9 +34,14 @@ debian-policy (3.9.2.0) UNRELEASED; urgency=low
     to remove the libc5 compatibility directories and mention the
     multiarch triplet directories.  Based on a patch by Charles Plessy.
     (Closes: #597074)
+  * Add introductory paragraphs for each archive area explaining briefly
+    the purpose of that archive area.  Based on a proposal by CJ
+    Fearnley.  (Closes: #594542)
   * Change all non-historical references to Debian GNU/Linux to simply
     Debian since Debian now includes FreeBSD-based architectures.  Patch
     from Guillem Jover.  (Closes: #594656)
+  * Remove references to the obsolete debmake package.
+  * Update the list of Policy maintainers.
   * Wrap Uploaders in debian/control.
   * Move Build-Depends-Indep to Build-Depends (there's no reason to use
     -Indep in a package that builds only architecture-independent binary

diff --git a/policy.sgml b/policy.sgml
index 7a3398745a8dd133dbf1afecfeb3faf2c750a205..ddfe3fe0245a74954378c8fb051c4573a920fff2 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -218,12 +218,13 @@
           The actual editing is done by a group of maintainers that have
           no editorial powers. These are the current maintainers:
 
-          <enumlist>
-            <item>Julian Gilbey</item>
-            <item>Branden Robinson</item>
-            <item>Josip Rodin</item>
-            <item>Manoj Srivastava</item>
-          </enumlist>
+         <enumlist>
+           <item>Russ Allbery</item>
+           <item>Bill Allombert</item>
+           <item>Andrew McMillan</item>
+           <item>Manoj Srivastava</item>
+           <item>Colin Watson</item>
+         </enumlist>
         </p>
 
        <p>
@@ -464,6 +465,20 @@
        <sect1 id="main">
          <heading>The main archive area</heading>
 
+         <p>
+           The <em>main</em> archive area comprises the Debian
+           distribution.  Only the packages in this area are considered
+           part of the distribution.  None of the packages in
+           the <em>main</em> archive area require software outside of
+           that area to function.  Anyone may use, share, modify and
+           redistribute the packages in this archive area
+           freely<footnote>
+             See <url id="http://www.debian.org/intro/free"
+                      name="What Does Free Mean?"> for
+             more about what we mean by free software.
+           </footnote>.
+         </p>
+
          <p>
            Every package in <em>main</em> must comply with the DFSG
            (Debian Free Software Guidelines).
@@ -495,6 +510,13 @@
        <sect1 id="contrib">
          <heading>The contrib archive area</heading>
 
+         <p>
+           The <em>contrib</em> archive area contains supplemental
+           packages intended to work with the Debian distribution, but
+           which require software outside of the distribution to either
+           build or function.
+         </p>
+
          <p>
            Every package in <em>contrib</em> must comply with the DFSG.
          </p>
@@ -513,7 +535,6 @@
            </list>
          </p>
 
-
          <p>
            Examples of packages which would be included in
            <em>contrib</em> are:
@@ -535,6 +556,15 @@
        <sect1 id="non-free">
          <heading>The non-free archive area</heading>
 
+         <p>
+           The <em>non-free</em> archive area contains supplemental
+           packages intended to work with the Debian distribution that do
+           not comply with the DFSG or have other problems that make
+           their distribution problematic.  They may not comply with all
+           of the policy requirements in this manual due to restrictions
+           on modifications or other limitations.
+         </p>
+
          <p>
            Packages must be placed in <em>non-free</em> if they are
            not compliant with the DFSG or are encumbered by patents
@@ -9339,13 +9369,13 @@ name ["<var>syshostname</var>"]:
           maintainer of the package is allowed to write this bug report
           themselves, if they so desire).  Do not close the bug report
           until a proper man page is available.<footnote>
-              It is not very hard to write a man page. See the
+             It is not very hard to write a man page. See the
              <url id="http://www.schweikhardt.net/man_page_howto.html"
                name="Man-Page-HOWTO">,
-             <manref name="man" section="7">, the examples
-              created by <prgn>debmake</prgn> or <prgn>dh_make</prgn>,
-             the helper program <prgn>help2man</prgn>, or the
-              directory <file>/usr/share/doc/man-db/examples</file>.
+             <manref name="man" section="7">, the examples created
+             by <prgn>dh_make</prgn>, the helper
+             program <prgn>help2man</prgn>, or the
+             directory <file>/usr/share/doc/man-db/examples</file>.
           </footnote>
        </p>
 
@@ -9816,13 +9846,10 @@ END-INFO-DIR-ENTRY
       </p>
 
       <p>
-       The Debian version of the FSF's GNU hello program is provided
-       as an example for people wishing to create Debian
-       packages. The Debian <prgn>debmake</prgn> package is
-       recommended as a very helpful tool in creating and maintaining
-       Debian packages. However, while the tools and examples are
-       helpful, they do not replace the need to read and follow the
-       Policy and Programmer's Manual.</p>
+       The Debian version of the FSF's GNU hello program is provided as
+       an example for people wishing to create Debian packages. However,
+       while the examples are helpful, they do not replace the need to
+       read and follow the Policy and Programmer's Manual.</p>
     </appendix>
 
     <appendix id="pkg-binarypkg">