[med-svn] r21729 - trunk/community/website/docs

[Afif Elghraoui]

Author: afif
Date: 2016-04-24 22:29:52 +0000 (Sun, 24 Apr 2016)
New Revision: 21729

Modified:
   trunk/community/website/docs/policy.xml
Log:
Improve backports directions

Advise using release tags as merge points rather
than branch heads, which cannot be reliably
trusted to be unchanged since the latest releases.
Also advise use of devscripts from stable-backports.



Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml	2016-04-24 02:53:24 UTC (rev 21728)
+++ trunk/community/website/docs/policy.xml	2016-04-24 22:29:52 UTC (rev 21729)
@@ -621,10 +621,12 @@
 			  The branch should be named using the release code names. As an example, the backports branch for Debian 8 ("jessie")
 			  should be named <literal>debian/jessie-backports</literal>, in accordance with
 			  <ulink url="http://dep.debian.net/deps/dep14/">DEP-14</ulink>.
+			  If you are developing on Stable, make sure to get the <literal>devscripts</literal> package from jessie-backports for <literal>dch --bpo</literal> to set the version properly.
 			</para>
 			<para>
 			  In Git, preparing a backport can be as simple as:
 			  <programlisting>
+			    <command>git checkout debian/2.4.0-1 # or whatever version you're backporting</command>
 			    <command>git checkout -b debian/jessie-backports</command>
 			    <command>dch --bpo</command>
 			  </programlisting>
@@ -640,7 +642,8 @@
 			  how to set that up.
 			  <programlisting>
 			    <command>git checkout debian/jessie-backports</command>
-			    <command>git merge debian/unstable</command> (or <literal>master</literal>)
+			    <command>git merge debian/3.0.0-1</command>
+			    <command>dch --bpo</command>
 			  </programlisting>
 			  Now, you can try building against a Stable chroot.
 			</para>