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

[Charles Plessy]

Author: plessy
Date: 2013-11-30 03:57:40 +0000 (Sat, 30 Nov 2013)
New Revision: 15337

Modified:
   trunk/community/website/docs/policy.xml
Log:
Ask everybody to use pristine-tar.


Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml	2013-11-30 03:35:34 UTC (rev 15336)
+++ trunk/community/website/docs/policy.xml	2013-11-30 03:57:40 UTC (rev 15337)
@@ -516,7 +516,10 @@
 		<sect2 id="updating-git-package">
 		  <title>Updating a source package managed with Git</title>
 		  <para>Most source packages maintained as Git repositories in Debian Med are using the <command>git-buildpackage</command> helper toolkit. In doubt, try this one first.</para>
-		  <para><command>git-buildpackage</command>'s command <command>git-import-orig</command> allows very easy update of the <emphasis>upstream</emphasis> branch when the original sources are distributed as a compressed archive. Its option <command>--pristine-tar</command> is useful for stabilizing the MD5 sum of the “<filename>orig.tar.gz</filename>” produced when building a source package from the repository alone (not doing so results in archive rejection of package updates). With recent versions of git-buildpackage, it is often unnecessary to rename the freshly downloaded original upstream archive.</para>
+		  <para><command>git-buildpackage</command>'s command <command>git-import-orig</command> makes it easy to update of the <emphasis>upstream</emphasis> branch using upstream releases distributed as a compressed archive, and to merge these changes in the <emphasis>master</emphasis> branch. Its option <command>--pristine-tar</command> is useful for stabilizing the MD5 sum of the “<filename>orig.tar.gz</filename>” produced when building a source package from the repository alone (not doing so results in archive rejection of package updates). With recent versions of git-buildpackage, it is often unnecessary to rename the freshly downloaded original upstream archive.</para>
+		  <para>If you do not use git-buildpackage, please use <command>pristine-tar</command> anyway to register the compressed archives that you upload to Debian as original upstream sources (the <literal>orig.tar.{gz|bz2|xz}</literal> file), with a command such as the following, where <literal>tarball</literal> is a path to the archive file and <literal>tag</literal> is the upstream release tag for that archive (as a fallback, if you created the tarball from a given branch, use the name of the branch).<programlisting>
+<code><command>pristine-tar commit</command> <option>tarball</option> <option>tag</option></code>
+</programlisting></para>
 		</sect2>
 	</sect1>
 	<sect1 id="packaging">