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

[Andreas Tille]

Author: tille
Date: 2018-01-10 15:29:11 +0000 (Wed, 10 Jan 2018)
New Revision: 24973

Modified:
   trunk/community/website/docs/policy.xml
Log:
Usually backports are done to stretch now rather than jessie


Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml	2018-01-10 15:25:20 UTC (rev 24972)
+++ trunk/community/website/docs/policy.xml	2018-01-10 15:29:11 UTC (rev 24973)
@@ -459,16 +459,16 @@
 			  Debian offers <ulink url="http://backports.debian.org">backports</ulink> to provide
 			  up-to-date software for users of the official stable releases. Backports of Debian Med packages
 			  should be kept as branches in our <link linkend="git-repository-structures">Git</link> repositories.
-			  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
+			  The branch should be named using the release code names. As an example, the backports branch for Debian 9 ("stretch")
+			  should be named <literal>debian/stretch-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.
+			  If you are developing on Stable, make sure to get the <literal>devscripts</literal> package from stretch-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>git checkout debian/VESIONTAG</command>
+			    <command>git checkout -b debian/stretch-backports</command>
 			    <command>dch --bpo</command>
 			  </programlisting>
 			  And then building the package using a Stable chroot after making any necessary adjustments to the packaging. See the
@@ -482,8 +482,8 @@
 			  package) to avoid getting unnecessary merge conflicts. See its manpage section "Integration with Git" for
 			  how to set that up.
 			  <programlisting>
-			    <command>git checkout debian/jessie-backports</command>
-			    <command>git merge debian/3.0.0-1</command>
+			    <command>git checkout debian/stretch-backports</command>
+			    <command>git merge debian/TO_BE_BACKPORTED_VERSION</command>
 			    <command>dch --bpo</command>
 			  </programlisting>
 			  Now, you can try building against a Stable chroot.