Breaks are supported in stable, so are now allowed in the archive

[debian/debian-policy.git] / policy.sgml

diff --git a/policy.sgml b/policy.sgml
index 975df943a26f00a5a1a816431507ba905deb322b..c82ced09ac88648db0865099478b9601dbdaa601 100644 (file)
--- a/policy.sgml
+++ b/policy.sgml
@@ -2588,6 +2588,14 @@ Package: libc6
            package control file when the source package has the same
            name and version as the binary package.
          </p>
+
+         <p>
+           Package names must consist only of lower case letters
+           (<tt>a-z</tt>), digits (<tt>0-9</tt>), plus (<tt>+</tt>)
+           and minus (<tt>-</tt>) signs, and periods (<tt>.</tt>).
+           They must be at least two characters long and must start
+           with an alphanumeric character.
+         </p>
        </sect1>
 
        <sect1 id="f-Maintainer">
@@ -4524,8 +4532,7 @@ Build-Depends: foo [!i386] | bar [!amd64]
          <prgn>dpkg</prgn> from upgrading or installing the package
          which declared such a conflict until the upgrade or removal
          of the conflicted-with package had been completed.  Instead,
-         <tt>Breaks</tt> may be used (once <tt>Breaks</tt> is supported
-         by the stable release of Debian).
+         <tt>Breaks</tt> may be used.
        </p>
       </sect>
 
@@ -5526,11 +5533,11 @@ libbar 1 bar1 (>= 1.0-1)
 
 
        <sect1 id="fhs">
-         <heading>File system Structure</heading>
+         <heading>File System Structure</heading>
 
          <p>
            The location of all installed files and directories must
-           comply with the File system Hierarchy Standard (FHS),
+           comply with the Filesystem Hierarchy Standard (FHS),
            version 2.3, with the exceptions noted below, and except
            where doing so would violate other terms of Debian
            Policy.  The following exceptions to the FHS apply:
@@ -5697,12 +5704,6 @@ rmdir /usr/local/share/emacs 2>/dev/null || true
            by any particular mail agents.  The use of the old
            location <file>/var/spool/mail</file> is deprecated, even
            though the spool may still be physically located there.
-           To maintain partial upgrade compatibility for systems
-           which have <file>/var/spool/mail</file> as their physical mail
-           spool, packages using <file>/var/mail</file> must depend on
-           either <package>libc6</package> (&gt;= 2.1.3-13), or on
-           <package>base-files</package> (&gt;= 2.2.0), or on later
-           versions of either one of these packages.
          </p>
        </sect1>
       </sect>
@@ -8419,11 +8420,6 @@ name ["<var>syshostname</var>"]:
                  </list>
              </item>
 
-             <item>
-                 Speedo fonts must be placed in
-                 <file>/usr/share/fonts/X11/Speedo/</file>.
-             </item>
-
              <item>
                  Type 1 fonts must be placed in
                  <file>/usr/share/fonts/X11/Type1/</file>.  If font
@@ -8435,9 +8431,9 @@ name ["<var>syshostname</var>"]:
                  Subdirectories of <file>/usr/share/fonts/X11/</file>
                  other than those listed above must be neither
                  created nor used.  (The <file>PEX</file>, <file>CID</file>,
-                 and <file>cyrillic</file> directories are excepted for
-                 historical reasons, but installation of files into
-                 these directories remains discouraged.)
+                 <file>Speedo</file>, and <file>cyrillic</file> directories
+                 are excepted for historical reasons, but installation of
+                 files into these directories remains discouraged.)
              </item>
 
              <item>