]> git.donarmstrong.com Git - debian/debian-policy.git/commitdiff
Merge branch 'master' into bug514919-rra
authorRuss Allbery <rra@debian.org>
Thu, 18 Jun 2009 23:11:14 +0000 (16:11 -0700)
committerRuss Allbery <rra@debian.org>
Thu, 18 Jun 2009 23:11:14 +0000 (16:11 -0700)
1  2 
policy.sgml

diff --combined policy.sgml
index b92be60864bcab12d9b28f96b05a25194762b7a9,e92793b38323e82434ca0d954bbc81a34106208d..f75e28257a6200d00a193c7eb260d85add849fb6
        <p>
          The Debian archive maintainers provide the authoritative
          list of sections.  At present, they are:
-         <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>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>,
-         <em>utils</em>, <em>web</em>, <em>x11</em>.
+         <em>admin</em>, <em>cli-mono</em>, <em>comm</em>, <em>database</em>,
+         <em>devel</em>, <em>debug</em>, <em>doc</em>, <em>editors</em>,
+         <em>electronics</em>, <em>embedded</em>, <em>fonts</em>,
+         <em>games</em>, <em>gnome</em>, <em>graphics</em>, <em>gnu-r</em>,
+         <em>gnustep</em>, <em>hamradio</em>, <em>haskell</em>,
+         <em>httpd</em>, <em>interpreters</em>, <em>java</em>, <em>kde</em>,
+         <em>kernel</em>, <em>libs</em>, <em>libdevel</em>, <em>lisp</em>,
+         <em>localization</em>, <em>mail</em>, <em>math</em>, <em>misc</em>,
+         <em>net</em>, <em>news</em>, <em>ocaml</em>, <em>oldlibs</em>,
+         <em>otherosfs</em>, <em>perl</em>, <em>php</em>, <em>python</em>,
+         <em>ruby</em>, <em>science</em>, <em>shells</em>, <em>sound</em>,
+         <em>tex</em>, <em>text</em>, <em>utils</em>, <em>vcs</em>,
+         <em>video</em>, <em>web</em>, <em>x11</em>, <em>xfce</em>,
+         <em>zope</em>.
        </p>
        </sect>
  
          <heading>Prompting in maintainer scripts</heading>
          <p>
            Package maintainer scripts may prompt the user if
-           necessary. Prompting should be done by communicating
+           necessary. Prompting must be done by communicating
            through a program, such as <prgn>debconf</prgn>, which
            conforms to the Debian Configuration Management
-           Specification, version 2 or higher.  Prompting the user by
-           other means, such as by hand<footnote>
-                 From the Jargon file: by hand 2. By extension,
-                 writing code which does something in an explicit or
-                 low-level way for which a presupplied library
-                 (<em>debconf, in this instance</em>) routine ought
-                 to have been available.
-             </footnote>, is now deprecated.
+           Specification, version 2 or higher.
+         </p>
+         <p>
+           Packages which are essential, or which are dependencies of
+           essential packages, may fall back on another prompting method
+           if no such interface is available when they are executed.
          </p>
  
          <p>
@@@ -2587,6 -2588,14 +2588,14 @@@ Package: libc
            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">
            distribution(s) where this version of the package should
            be installed.  Valid distributions are determined by the
            archive maintainers.<footnote>
 -              Current distribution names are:
 +            Current distribution names in the Debian archive used in
 +            <file>.changes</file> files are:
                <taglist compact="compact">
 -                <tag><em>stable</em></tag>
 -                <item>
 -                    This is the current "released" version of Debian
 -                    GNU/Linux.  Once the distribution is
 -                    <em>stable</em> only security fixes and other
 -                    major bug fixes are allowed. When changes are
 -                    made to this distribution, the release number is
 -                    increased (for example: 2.2r1 becomes 2.2r2 then
 -                    2.2r3, etc).
 -                </item>
 -
                  <tag><em>unstable</em></tag>
                  <item>
 -                    This distribution value refers to the
 -                    <em>developmental</em> part of the Debian
 -                    distribution tree. New packages, new upstream
 -                    versions of packages and bug fixes go into the
 -                    <em>unstable</em> directory tree. Download from
 -                    this distribution at your own risk.
 +                  This distribution value refers to the
 +                  <em>developmental</em> part of the Debian distribution
 +                  tree.  Most new packages, new upstream versions of
 +                  packages and bug fixes go into the <em>unstable</em>
 +                  directory tree.
                  </item>
  
 -                <tag><em>testing</em></tag>
 +                <tag><em>experimental</em></tag>
                  <item>
 -                    This distribution value refers to the
 -                    <em>testing</em> part of the Debian distribution
 -                    tree.  It receives its packages from the
 -                    unstable distribution after a short time lag to
 -                    ensure that there are no major issues with the
 -                    unstable packages.  It is less prone to breakage
 -                    than unstable, but still risky.  It is not
 -                    possible to upload packages directly to
 -                    <em>testing</em>.
 +                  The packages with this distribution value are deemed
 +                  by their maintainers to be high risk.  Oftentimes they
 +                  represent early beta or developmental packages from
 +                  various sources that the maintainers want people to
 +                  try, but are not ready to be a part of the other parts
 +                  of the Debian distribution tree.
                  </item>
  
 -                <tag><em>frozen</em></tag>
 +                <tag><em>stable-proposed-updates</em></tag>
                  <item>
 -                    From time to time, the <em>testing</em>
 -                    distribution enters a state of "code-freeze" in
 -                    anticipation of release as a <em>stable</em>
 -                    version. During this period of testing only
 -                    fixes for existing or newly-discovered bugs will
 -                    be allowed.  The exact details of this stage are
 -                    determined by the Release Manager.
 +                  Once a distribution of Debian GNU/Linux is released,
 +                  it is declared <em>stable</em> and only security fixes
 +                  and other major bug fixes are allowed.  Proposed
 +                  non-security updates for <em>stable</em> are uploaded
 +                  using this distribution value after getting approval
 +                  from the stable release managers.
                  </item>
  
 -                <tag><em>experimental</em></tag>
 +                <tag><em>testing-proposed-updates</em></tag>
                  <item>
 -                    The packages with this distribution value are
 -                    deemed by their maintainers to be high
 -                    risk. Oftentimes they represent early beta or
 -                    developmental packages from various sources that
 -                    the maintainers want people to try, but are not
 -                    ready to be a part of the other parts of the
 -                    Debian distribution tree. Download at your own
 -                    risk.
 +                  The <em>testing</em> distribution normally receives
 +                  its packages via the <em>unstable</em> distribution
 +                  after a short time lag.  However sometimes, such as
 +                  during release freezes before a new stable release or
 +                  when a problem in the <em>testing</em> distribution
 +                  requires fixing before the <em>unstable</em> version
 +                  can migrate, direct updates to a package in
 +                  <em>testing</em> are useful.  This distribution value
 +                  is used for those exceptions, after approval from the
 +                  release managers.
                  </item>
                </taglist>
  
                <p>
 -                You should list <em>all</em> distributions that the
 -                package should be installed into.
 +                Security fixes for the <em>stable</em> or
 +                <em>testing</em> distributions are handled via a
 +                separate upload queue and special
 +                <em>stable-security</em> and <em>testing-security<em>
 +                distribution values.
                </p>
  
                <p>
                  Reference, section "The Debian archive".
                </p>
            </footnote>
 +          The Debian archive software only supports listing a single
 +          distribution.  Migration of packages to other distributions is
 +          handled outside of the upload process.
          </p>
        </sect1>
  
@@@ -4426,12 -4442,6 +4435,6 @@@ Build-Depends: foo [!i386] | bar [!amd6
        <sect id="breaks">
        <heading>Packages which break other packages - <tt>Breaks</tt></heading>
  
-       <p>
-         Using <tt>Breaks</tt> may cause problems for upgrades from older
-         versions of Debian and should not be used until the stable
-         release of Debian supports <tt>Breaks</tt>.
-       </p>
        <p>
          When one binary package declares that it breaks another,
          <prgn>dpkg</prgn> will refuse to allow the package which
          <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>
  
@@@ -5518,23 -5527,16 +5520,16 @@@ 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:
  
              <enumlist>
-               <item>
-                 <p>
-                   Legacy XFree86 servers are permitted to retain the
-                   configuration file location 
-                   <file>/etc/X11/XF86Config-4</file>.
-                 </p>
-               </item>
                <item>
                  <p>
                    The optional rules related to user specific
@@@ -5696,12 -5698,6 +5691,6 @@@ rmdir /usr/local/share/emacs 2>/dev/nul
            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>
@@@ -8418,11 -8414,6 +8407,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
                  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>
@@@ -9041,8 -9032,8 +9025,8 @@@ install-info --quiet --remove /usr/shar
        <p>
          Packages distributed under the UCB BSD license, the Apache
          license (version 2.0), the Artistic license, the GNU GPL
-         (version 2 or 3), the GNU LGPL (versions 2, 2.1, or 3), and
-         the GNU FDL (version 1.2) should refer to the corresponding
+         (version 2 or 3), the GNU LGPL (versions 2, 2.1, or 3), and the
+         GNU FDL (versions 1.2 or 1.3) should refer to the corresponding
          files under <file>/usr/share/common-licenses</file>,<footnote>
            <p>
              In particular,
                <file>/usr/share/common-licenses/GPL-3</file>,
                <file>/usr/share/common-licenses/LGPL-2</file>,
                <file>/usr/share/common-licenses/LGPL-2.1</file>,
-               <file>/usr/share/common-licenses/LGPL-3</file>, and
-               <file>/usr/share/common-licenses/GFDL-1.2</file>
+               <file>/usr/share/common-licenses/LGPL-3</file>,
+               <file>/usr/share/common-licenses/GFDL-1.2</file>, and
+               <file>/usr/share/common-licenses/GFDL-1.3</file>
                respectively.
              </p>
            </footnote> rather than quoting them in the copyright