<!-- common, language independant entities -->
<!entity % commondata SYSTEM "common.ent" > %commondata;
<!-- CVS revision of this document -->
- <!entity cvs-rev "$Revision: 1.76 $">
+ <!entity cvs-rev "$Revision: 1.78 $">
<!-- if you are translating this document, please notate the RCS
revision of the developers reference here -->
&email-debian-policy;, &email-debian-user;, &email-debian-private;,
&email-debian-announce;, and &email-debian-devel-announce;. All
developers are expected to be subscribed to at least
-&email-debian-private; and &email-debian-devel-announce;. There are
-other mailing lists are available for a variety of special topics; see
+&email-debian-devel-announce;. There are
+other mailing lists available for a variety of special topics; see
<url id="&url-debian-lists-subscribe;"> for a list. Cross-posting
(sending the same message to multiple lists) is discouraged.
<p>
directory of the archive (because of backwards compatibility).
- <sect1>Stable, testing, unstable, and sometimes frozen
+ <sect1 id="sec-dists">Stable, testing, and unstable
<p>
-There is always a distribution called <em>stable</em> (residing in
+There are always distributions called <em>stable</em> (residing in
<tt>dists/stable</tt>), one called <em>testing</em> (residing in
<tt>dists/testing</tt>), and one called <em>unstable</em> (residing in
<tt>dists/unstable</tt>). This reflects the development process of the
<p>
Packages get copied from <em>unstable</em> to <em>testing</em> if they
satisfy certain criteria. To get into <em>testing</em> distribution, a
-package needs to be in the archive for two weeks and not have any release
-critical bugs. After that period, it will propagate into <em>testing</em>
-as soon as anything it depends on is also added. This process is automatic.
+package needs to be in the archive for two weeks and not have any
+release critical bugs. After that period, it will propagate into
+<em>testing</em> as soon as anything it depends on is also added. This
+process is automatic. You can see some notes on this system as well
+as <tt>update_excuses</tt> (describing which packages are valid
+candidates, which are not, and why not) at <url
+id="&url-testing-maint;">.
<p>
After a period of development, once the release manager deems fit, the
-<em>testing</em> distribution is renamed to <em>frozen</em>. Once
-that has been done, no changes are allowed to that distribution except
-bug fixes; that's why it's called ``frozen.'' After another month or
-a little longer, depending on the progress, the <em>frozen</em> distribution
+<em>testing</em> distribution is frozen, meaning that the policies
+which control how packages move from <em>unstable</em> to testing are
+tightened. Packages which are too buggy are removed. No changes are
+allowed into <em>testing</em> except for bug fixes. After some time
+has elapsed, depending on progress, the <em>testing</em> distribution
goes into a `deep freeze', when no changes are made to it except those
-needed for the installation system. This is called a ``test cycle'', and it
-can last up to two weeks. There can be several test cycles, until the
-distribution is prepared for release, as decided by the release manager.
-At the end of the last test cycle, the <em>frozen</em> distribution is
-renamed to <em>stable</em>, overriding the old <em>stable</em> distribution,
-which is removed at that time.
+needed for the installation system. This is called a ``test cycle'',
+and it can last up to two weeks. There can be several test cycles,
+until the distribution is prepared for release, as decided by the
+release manager. At the end of the last test cycle, the
+<em>testing</em> distribution is renamed to <em>stable</em>,
+overriding the old <em>stable</em> distribution, which is removed at
+that time (although they can be found at <tt>archive-host;</tt>).
<p>
This development cycle is based on the assumption that the
<em>unstable</em> distribution becomes <em>stable</em> after passing a
-period of testing as <em>frozen</em>. Even once a distribution is
-considered stable, a few bugs inevitably remain &mdash that's why the stable
-distribution is updated every now and then. However, these updates are
-tested very carefully and have to be introduced into the archive
-individually to reduce the risk of introducing new bugs. You can find
-proposed additions to <em>stable</em> in the <tt>proposed-updates</tt>
-directory. Those packages in <tt>proposed-updates</tt> that pass
-muster are periodically moved as a batch into the stable distribution
-and the revision level of the stable distribution is incremented
-(e.g., `1.3' becomes `1.3r1', `2.0r2' becomes `2.0r3', and so forth).
+period of being in <em>testing</em>. Even once a distribution is
+considered stable, a few bugs inevitably remain &mdash that's why the
+stable distribution is updated every now and then. However, these
+updates are tested very carefully and have to be introduced into the
+archive individually to reduce the risk of introducing new bugs. You
+can find proposed additions to <em>stable</em> in the
+<tt>proposed-updates</tt> directory. Those packages in
+<tt>proposed-updates</tt> that pass muster are periodically moved as a
+batch into the stable distribution and the revision level of the
+stable distribution is incremented (e.g., `1.3' becomes `1.3r1',
+`2.0r2' becomes `2.0r3', and so forth).
<p>
Note that development under <em>unstable</em> continues during the
``freeze'' period, since the <em>unstable</em> distribution remains in
-place when the <em>testing</em> is moved to <em>frozen</em>.
-Another wrinkle is that when the <em>frozen</em> distribution is
-offically released, the old stable distribution is completely removed
-from the Debian archives (although they do live on at
-<tt>archive-host;</tt>).
- <p>
-In summary, there is always a <em>stable</em>, a <em>testing</em> and an
-<em>unstable</em> distribution available, and a <em>frozen</em> distribution
-shows up for a couple of months from time to time.
-
+place in parallel with <em>testing</em>.
<sect1>Experimental
<p>
`slink'). These names stay the same during the development period and
after the release; symbolic links, which can be changed easily,
indicate the currently released stable distribution. That's why the
-real distribution directories use the <em>code names</em>, while symbolic
-links for <em>stable</em>, <em>testing</em>, <em>unstable</em>, and
-<em>frozen</em> point to the appropriate release directories.
+real distribution directories use the <em>code names</em>, while
+symbolic links for <em>stable</em>, <em>testing</em>, and
+<em>unstable</em> point to the appropriate release directories.
<chapt id="upload">Package uploads
the <file>debian/changelog</file> file, indicates which distribution the
package is intended for.
<p>
-There are four possible values for this field: `stable', `unstable',
-`frozen', and `experimental'. Normally, packages are uploaded into
+There are three possible values for this field: `stable', `unstable',
+and `experimental'. Normally, packages are uploaded into
<em>unstable</em>.
<p>
-These values can be combined, but only a few combinations make sense.
-If Debian has been frozen, and you want to get a bug-fix release into
-<em>frozen</em>, you would set the distribution to `frozen unstable'.
-See <ref id="upload-frozen"> for more information on uploading to
-<em>frozen</em>.
- <p>
You should avoid combining `stable' with others because of potential
problems with library dependencies (for your package and for the package
built by the build daemons for other architecture).
It never makes sense to combine the <em>experimental</em> distribution
with anything else.
+<!--
<sect2 id="upload-frozen">Uploading to <em>frozen</em>
<p>
The Debian freeze is a crucial time for Debian. It is our chance to
original bug fixed and the severity of the bug newly introduced by the
fix.
+ -->
+
<sect2 id="upload-stable">Uploading to <em>stable</em>
<p>
If a package is released with the <tt>Distribution:</tt> set to
`stable', the announcement is sent to &email-debian-changes;. If a
package is released with <tt>Distribution:</tt> set to `unstable',
-`experimental', or `frozen' (when present), the announcement will be
+or `experimental', the announcement will be
posted to &email-debian-devel-changes; instead.
<p>
The <prgn>dupload</prgn> program is clever enough to determine
<sect id="nmu-when">When to do a source NMU
<p>
Guidelines for when to do a source NMU depend on the target
-distribution, i.e., stable, unstable, or frozen. Porters have
+distribution, i.e., stable, unstable, or experimental. Porters have
slightly different rules than non-porters, due to their unique
circumstances (see <ref id="source-nmu-when-porter">).
<p>
cannot be reached in time, a security officer may upload a fixed
package (i.e., do a source NMU).
<p>
-During the release freeze (see <ref id="upload-frozen">), NMUs which
-fix serious or higher severity bugs are encouraged and accepted.
-Even during this window, however, you should endeavor to reach the
-current maintainer of the package; they might be just about to upload
-a fix for the problem. As with any source NMU, the guidelines found
-in <ref id="nmu-guidelines"> need to be followed.
+During the release cycle (see <ref id="sec-dists">), NMUs which fix
+serious or higher severity bugs are encouraged and accepted. Even
+during this window, however, you should endeavor to reach the current
+maintainer of the package; they might be just about to upload a fix
+for the problem. As with any source NMU, the guidelines found in <ref
+id="nmu-guidelines"> need to be followed.
<p>
Bug fixes to unstable by non-maintainers are also acceptable, but only
as a last resort or with permission. Try the following steps first,
we maintain our archive.)
<p>
If the source NMU (non-maintainer upload) fixes some existing bugs,
-the bugs in the Bug Tracking System which are fixed need to be
-<em>notified</em> but not actually <em>closed</em> by the
-non-maintainer. Technically, only the official package maintainer or
-the original bug submitter are allowed to close bugs. However, the
-person making the non-maintainer release must send a short message to
-the relevant bugs explaining that the bugs have been fixed by the NMU.
-Using <email>control@bugs.debian.org</email>, the party doing the NMU
-should also set the severity of the bugs fixed in the NMU to `fixed'.
-This ensures that everyone knows that the bug was fixed in an NMU;
-however the bug is left open until the changes in the NMU are
-incorporated officially into the package by the official package
-maintainer. Also, open a bug with the patches needed to fix the
-problem, or make sure that one of the other (already open) bugs has
-the patches.
- <p>
-The normal maintainer will either apply the patch or employ an
-alternate method of fixing the problem. Sometimes bugs are fixed
-independently upstream, which is another good reason to back out an
-NMU's patch. If the maintainer decides not to apply the NMU's patch
-but to release a new version, the maintainer needs to ensure that the
-new upstream version really fixes each problem that was fixed in the
-non-maintainer release.
+these bugs should be tagged <em>fixed</em> in the Bug Tracking
+System rather than closed. By convention, only the official package
+maintainer or the original bug submitter are allowed to close bugs.
+Fortunately, Debian's archive system recognizes NMUs and thus marks
+the bugs fixed in the NMU appropriately if the person doing the NMU
+has listed all bugs in the changelog with the <tt>Closes:
+bug#<var>nnnnn</var></tt> syntax (see <ref id="upload-bugfix"> for
+more information describing how to close bugs via the changelog).
+Tagging the bugs <em>fixed</em> ensures that everyone knows that the
+bug was fixed in an NMU; however the bug is left open until the
+changes in the NMU are incorporated officially into the package by
+the official package maintainer.
+ <p>
+Also, after doing an NMU, you have to open a new bug and include a
+patch showing all the changes you have made. The normal maintainer
+will either apply the patch or employ an alternate method of fixing
+the problem. Sometimes bugs are fixed independently upstream, which
+is another good reason to back out an NMU's patch. If the maintainer
+decides not to apply the NMU's patch but to release a new version,
+the maintainer needs to ensure that the new upstream version really
+fixes each problem that was fixed in the non-maintainer release.
<p>
In addition, the normal maintainer should <em>always</em> retain the
entry in the changelog file documenting the non-maintainer upload.
the wait cycle for a porter's source NMU is smaller than for a
non-porter, since porters have to cope with a large quantity of
packages.
- <p>
Again, the situation varies depending on the distribution they are
-uploading to. Crucial fixes (i.e., changes need to get a source
+uploading to.
+
+<!--
+FIXME: commented out until I can work out how to upload to testing directly
+
+ Crucial fixes (i.e., changes need to get a source
package to compile for a released-targeted architecture) can be
uploaded with <em>no</em> waiting period for the `frozen' distribution.
+ -->
<p>
However, if you are a porter doing an NMU for `unstable', the above
guidelines for porting should be followed, with two variations.