[developers-reference] 07/08: adjust codename and release number
This is an automated email from the git hooks/post-receive script.
henrich pushed a commit to branch master
in repository developers-reference.
commit 5fb74f85857ddd0494a232a7cb756339c9db28b4
Author: Hideki Yamane <henrich@debian.org>
Date: Thu May 28 21:44:02 2015 +0900
adjust codename and release number
---
debian/changelog | 1 +
pkgs.dbk | 4 ++--
resources.dbk | 6 ++++--
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ead5b46..8e9a272 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ developers-reference (3.4.15) UNRELEASED; urgency=medium
Thanks to Stefano Rivera <stefanor@debian.org> (Closes: #780243)
* suggest to use "<codename><n> version" scheme.
Thanks to Stefano Rivera <stefanor@debian.org> (Closes: #768426)
+ * adjust release codename and version number.
-- Raphaël Hertzog <hertzog@debian.org> Wed, 11 Feb 2015 09:28:19 +0100
diff --git a/pkgs.dbk b/pkgs.dbk
index c97bf4e..457619d 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -1124,7 +1124,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>wheezy-security</literal>).
+(e.g. <literal>jessie-security</literal>).
Do not target <replaceable>distribution</replaceable><literal>-proposed-updates</literal> or
<literal>stable</literal>!
</para>
@@ -1155,7 +1155,7 @@ you have already used for a previous upload, or one that conflicts with a
binNMU. The convention is to append
<literal>+deb</literal><replaceable>X</replaceable><literal>u1</literal> (where
<replaceable>X</replaceable> is the major release number), e.g.
-<literal>1:2.4.3-4+deb7u1</literal>, of course increasing 1 for any subsequent
+<literal>1:2.4.3-4+deb8u1</literal>, of course increasing 1 for any subsequent
uploads.
</para>
</listitem>
diff --git a/resources.dbk b/resources.dbk
index 4fa5909..4b939e6 100644
--- a/resources.dbk
+++ b/resources.dbk
@@ -771,8 +771,10 @@ 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.0, <literal>wheezy</literal>;
-and the next release will be called <literal>jessie</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>.
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/developers-reference.git
Reply to: