From 09e125ec82ca59b994894e07b977ea10c73573e0 Mon Sep 17 00:00:00 2001
From: jcristau <jcristau@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Tue, 14 May 2013 19:21:34 +0000
Subject: [PATCH] Update versioning advice for uploads to stable/testing
 (closes: #685646).

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@10134 313b444b-1b9f-4f58-a734-7bb04f332e8d
---
 debian/changelog |  3 +++
 pkgs.dbk         | 23 +++++++----------------
 2 files changed, 10 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b95d540..142734e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ developers-reference (3.4.10) UNRELEASED; urgency=low
   [ Hideki Yamane ]
   * introduce epub support (Closes: #652044)
 
+  [ Thijs Kinkhorst ]
+  * Update versioning advice for uploads to stable/testing (closes: #685646).
+
  -- Raphaël Hertzog <hertzog@debian.org>  Mon, 17 Sep 2012 17:20:49 +0200
 
 developers-reference (3.4.9) unstable; urgency=low
diff --git a/pkgs.dbk b/pkgs.dbk
index 07b3f85..768a8cc 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -2137,26 +2137,17 @@ It also has the
 benefit of making it visually clear that a package in the archive was not made
 by the official maintainer.
 </para>
-
 <para>
 If you upload a package to testing or stable, you sometimes need to "fork" the
 version number tree. This is the case for security uploads, for example.  For
 this, a version of the form
-<literal>+deb<replaceable>XY</replaceable>u<replaceable>Z</replaceable></literal>
-should be used, where <replaceable>X</replaceable> and
-<replaceable>Y</replaceable> are the major and minor release numbers, and
-<replaceable>Z</replaceable> is a counter starting at <literal>1</literal>.
-When the release number is not yet known (often the case for
-<literal>testing</literal>, at the beginning of release cycles), the lowest
-release number higher than the last stable release number must be used.  For
-example, while Lenny (Debian 5.0) is stable, a security NMU to stable for a
-package at version <literal>1.5-3</literal> would have version
-<literal>1.5-3+deb50u1</literal>, whereas a security NMU to Squeeze would get
-version <literal>1.5-3+deb60u1</literal>. After the release of Squeeze, security
-uploads to the <literal>testing</literal> distribution will be versioned
-<literal>+deb61uZ</literal>, until it is known whether that release will be
-Debian 6.1 or Debian 7.0 (if that becomes the case, uploads will be versioned
-as <literal>+deb70uZ</literal>).
+<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.0) 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 NMU to Jessie would get
+version <literal>1.5-3+deb8u1</literal>.
 </para>
 </section>
 
-- 
2.30.2