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

[Afif Elghraoui]

Author: afif-guest
Date: 2015-08-15 04:05:08 +0000 (Sat, 15 Aug 2015)
New Revision: 19939

Modified:
   trunk/community/website/docs/policy.xml
Log:
Expand section on backports and fix stray typo


Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml	2015-08-14 16:15:31 UTC (rev 19938)
+++ trunk/community/website/docs/policy.xml	2015-08-15 04:05:08 UTC (rev 19939)
@@ -399,7 +399,7 @@
 			</sect3>
 			<sect3 id="git-track-new-branches">
 				<title>To track extra upstream branches, simply check them out.</title>
-				<para>With recent versions of git, the remote branch will be automatically tracked when running <command>git</command> checkout.  For example, when a <literal>pristine-tar</literal> branch is available upstream and not yet tracked locally, the command <command>git checkout</command> <option><replaceable>pristine-tar</replaceable></option> will implicitely run the command <command>git branch</command> <option>-t <replaceable>pristine-tar</replaceable> <replaceable>origin/pristine-tar</replaceable></option>.
+				<para>With recent versions of git, the remote branch will be automatically tracked when running <command>git</command> checkout.  For example, when a <literal>pristine-tar</literal> branch is available upstream and not yet tracked locally, the command <command>git checkout</command> <option><replaceable>pristine-tar</replaceable></option> will implicitly run the command <command>git branch</command> <option>-t <replaceable>pristine-tar</replaceable> <replaceable>origin/pristine-tar</replaceable></option>.
         </para>
   		</sect3>
   		<sect3 id="git-missing-pristine-tar">
@@ -597,8 +597,34 @@
 		<sect2 id="backports">
 			<title>Backports</title>
 			<para>
-				Debian offers <ulink url="http://backports.debian.org">backports</ulink> to its stable version.  Backports of Debian Med packages should be kept as branches in our <link linkend="svn-repository-structure">Subversion</link> or <link linkend="git-repository-structures">Git</link> repositories.
+			  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="svn-repository-structure">Subversion</link> or
+			  <link linkend="git-repository-structures">Git</link> repositories. In Git, 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</literal>.
 			</para>
+			<para>
+			  In Git, preparing a backport can be as simple as:
+			  <programlisting>
+			    <command>git checkout -b debian/jessie</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
+			  <ulink url="https://wiki.debian.org/BuildingFormalBackports">wiki on backports</ulink> and
+			  the <ulink url="http://backports.debian.org">main backports website</ulink> for more detailed instructions.
+			</para>
+			<para>
+			  When preparing subsequent versions of a backport, the changelog should
+			  include all the changes since the previous backported version:
+			  <programlisting>
+			    <command>git checkout debian/jessie</command>
+			    <command>git merge master</command>
+			  </programlisting>
+			  You will get a merge conflict on the changelog. When resolving the conflict,
+			  keep the entry from the previous backport(s) as well as the subsequent
+			  changelog entries from the uploads to Unstable.
+			</para>
 		</sect2>
 		<sect2 id="ppa">
 			<title>PPA for Ubuntu</title>