From: hertzog <hertzog@313b444b-1b9f-4f58-a734-7bb04f332e8d>
Date: Wed, 22 May 2013 08:42:28 +0000 (+0000)
Subject: Update versioning advice for security uploads as well. Closes: #709218 Thanks to... 
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=developers-reference.git;a=commitdiff_plain;h=f622f4691ccc7746b4702ee89f55dc97c505c89d

Update versioning advice for security uploads as well. Closes: #709218 Thanks to Salvatore Bonaccorso for the patch.

git-svn-id: svn://anonscm.debian.org/ddp/manuals/trunk/developers-reference@10164 313b444b-1b9f-4f58-a734-7bb04f332e8d
---

diff --git a/debian/changelog b/debian/changelog
index 2955b3a..26f4624 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+developers-reference (3.4.11) UNRELEASED; urgency=low
+
+  * Update versioning advice for security uploads as well. Closes: #709218
+    Thanks to Salvatore Bonaccorso for the patch.
+
+ -- Raphaël Hertzog <hertzog@debian.org>  Wed, 22 May 2013 10:38:41 +0200
+
 developers-reference (3.4.10) unstable; urgency=low
 
   * Team upload.
diff --git a/pkgs.dbk b/pkgs.dbk
index 9922576..814c6ff 100644
--- a/pkgs.dbk
+++ b/pkgs.dbk
@@ -1153,8 +1153,9 @@ later distributions.  If in doubt, test it with <literal>dpkg
 --compare-versions</literal>.  Be careful not to re-use a version number that
 you have already used for a previous upload, or one that conflicts with a
 binNMU. The convention is to append
-<literal>+</literal><replaceable>codename</replaceable><literal>1</literal>, e.g.
-<literal>1:2.4.3-4+lenny1</literal>, of course increasing 1 for any subsequent
+<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
 uploads.
 </para>
 </listitem>