Move information about codenames/versions into the entities. Refer readers to the website for a list of obsolete releases. --- common.ent | 13 +++++++++++++ pkgs.dbk | 13 ++++++------- resources.dbk | 19 ++++++++----------- 3 files changed, 27 insertions(+), 18 deletions(-)
diff --git a/common.ent b/common.ent index ca802a4..a1ec2b0 100644 --- a/common.ent +++ b/common.ent @@ -15,6 +15,18 @@ <!ENTITY number-of-arches "11"> +<!-- semi-volatile information --> +<!ENTITY codename-oldoldstable "squeeze"> +<!ENTITY codename-oldstable "wheezy"> +<!ENTITY codename-stable "jessie"> +<!ENTITY codename-testing "stretch"> +<!ENTITY codename-nexttesting "buster"> +<!ENTITY version-oldoldstable "6.0"> +<!ENTITY version-oldstable "7"> +<!ENTITY version-stable "8"> +<!ENTITY version-testing "9"> +<!ENTITY version-nexttesting "10"> + <!-- standard information --> <!ENTITY fsf-addr "Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA"> @@ -67,6 +79,7 @@ <!ENTITY url-devel-machines "https://db.debian.org/machines.cgi";> <!ENTITY url-buildd "https://buildd.debian.org/";> <!ENTITY url-release-wb "https://release.debian.org/wanna-build.txt";> +<!ENTITY url-releases "https://&www-debian-org;/releases/";> <!ENTITY url-wb-team "https://lists.debian.org/debian-project/2009/03/msg00096.html";> <!ENTITY url-lintian "https://lintian.debian.org/";> <!ENTITY url-debian-qa "https://qa.debian.org/";> diff --git a/pkgs.dbk b/pkgs.dbk index 126eaac..5bbd53d 100644 --- a/pkgs.dbk +++ b/pkgs.dbk @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="utf-8"?> -<!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" +<?xml version="1.0" encoding="utf-8"?> <!DOCTYPE chapter PUBLIC "-//OASIS//DTD DocBook XML V4.4//EN" "http://www.oasis-open.org/docbook/xml/4.4/docbookx.dtd"; [ <!ENTITY % commondata SYSTEM "common.ent" > %commondata; ]> @@ -1124,7 +1123,7 @@ Be sure to verify the following items: <emphasis role="strong">Target the right distribution</emphasis> in your <filename>debian/changelog</filename>: <replaceable>codename</replaceable><literal>-security</literal> -(e.g. <literal>jessie-security</literal>). +(e.g. <literal>&codename-stable;-security</literal>). Do not target <replaceable>distribution</replaceable><literal>-proposed-updates</literal> or <literal>stable</literal>! </para> @@ -2157,10 +2156,10 @@ this, a version of the form <literal>+deb<replaceable>X</replaceable>u<replaceable>Y</replaceable></literal> should be used, where <replaceable>X</replaceable> is the major release number, and <replaceable>Y</replaceable> is a counter starting at <literal>1</literal>. -For example, while Wheezy (Debian 7) is stable, a security NMU to stable for +For example, while &codename-stable; (Debian &version-stable;) is stable, a security NMU to stable for a package at version <literal>1.5-3</literal> would have version -<literal>1.5-3+deb7u1</literal>, whereas a security upload to Jessie would get -version <literal>1.5-3+deb8u1</literal>. +<literal>1.5-3+deb&version-stable;u1</literal>, whereas a security upload to &codename-testing; would get +version <literal>1.5-3+deb&version-testing;u1</literal>. </para> </section> @@ -2771,7 +2770,7 @@ Make sure that you included an appropriate explanation in the changelog; <listitem> <para> Make sure that you've written the testing -<link linkend="codenames">code name</link> (e.g. <literal>jessie</literal>) +<link linkend="codenames">code name</link> (e.g. <literal>&codename-testing;</literal>) into your target distribution; </para> </listitem> diff --git a/resources.dbk b/resources.dbk index 4b939e6..68116a8 100644 --- a/resources.dbk +++ b/resources.dbk @@ -765,16 +765,12 @@ space on <literal>people.debian.org</literal>. <section id="codenames"> <title>Release code names</title> <para> -Every released Debian distribution has a <literal>code name</literal>: Debian -1.1 is called <literal>buzz</literal>; Debian 1.2, <literal>rex</literal>; -Debian 1.3, <literal>bo</literal>; Debian 2.0, <literal>hamm</literal>; -Debian 2.1, <literal>slink</literal>; Debian 2.2, <literal>potato</literal>; -Debian 3.0, <literal>woody</literal>; Debian 3.1, <literal>sarge</literal>; -Debian 4.0, <literal>etch</literal>; Debian 5.0, <literal>lenny</literal>; -Debian 6.0, <literal>squeeze</literal>; Debian 7, <literal>wheezy</literal>; -Debian 8, <literal>jessie</literal>; -the next release Debian 9 will be called <literal>stretch</literal> -and Debian 10 will be called <literal>buster</literal>. +Every released Debian distribution has a <literal>code name</literal>: +Debian &version-oldoldstable; is called <literal>&codename-oldoldstable;</literal>; +Debian &version-oldstable;, <literal>&codename-oldstable;</literal>; +Debian &version-stable;, <literal>&codename-stable;</literal>; +the next release Debian &version-testing; will be called <literal>&codename-testing;</literal> +and Debian &version-nexttesting; will be called <literal>&codename-nexttesting;</literal>. There is also a ``pseudo-distribution'', called <literal>sid</literal>, which is the current <literal>unstable</literal> distribution; since packages are moved from <literal>unstable</literal> to @@ -784,6 +780,7 @@ distribution, <literal>sid</literal> contains packages for architectures which are not yet officially supported or released by Debian. These architectures are planned to be integrated into the mainstream distribution at some future date. +The codenames and versions for older releases are <a href="&url-releases">listed</a> on the website. </para> <para> Since Debian has an open development model (i.e., everyone can participate and @@ -805,7 +802,7 @@ was 1.1, and not 1.0.) </para> <para> Thus, the names of the distribution directories in the archive are determined -by their code names and not their release status (e.g., `squeeze'). These names +by their code names and not their release status (e.g., `&codename-stable;'). 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 -- 2.6.1
