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

[Charles Plessy]

Author: plessy
Date: 2013-11-30 05:59:42 +0000 (Sat, 30 Nov 2013)
New Revision: 15346

Modified:
   trunk/community/website/docs/policy.xml
Log:
Recommend the 3.0 (quilt) format, and the single-debian-patch opt. when committing changes directly.


Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml	2013-11-30 05:43:27 UTC (rev 15345)
+++ trunk/community/website/docs/policy.xml	2013-11-30 05:59:42 UTC (rev 15346)
@@ -737,7 +737,30 @@
 			<title><filename>debian/README.test</filename></title>
 			<para>This file was (<ulink url="http://lists.debian.org/debian-devel-announce/2011/01/msg00006.html">recommended by the Security team</ulink>) for describing to others than the regular maintainer how the package's functionality can properly be tested.</para>
 		</sect2>
+
+		<sect2 id="debian-source-format">
+			<title><filename>debian/source/format</filename></title>
+			<para>
+				This file sould contain <quote><literal>3.0 (quilt)</literal></quote> in
+				order to use this source format.  Other formats should be avoided unless
+				they bring a specific advantage.
+			</para>
+		</sect2>
 		
+		<sect2 id="debian-source-option">
+			<title><filename>debian/source/option</filename></title>
+			<para>
+				For packages not using <link linkend="quilt">quilt</link> patches, for
+				example when committing changes directly to the Debian branch, this file
+				should contain <quote><literal>single-debian-patch</literal></quote> in
+				order to emulate the <literal>1.0</literal> format.  This is better than
+				using the <literal>1.0</literal> format directly because the <literal>3.0
+				(quilt)</literal> format brings other advantages, in particular the
+				conservation of file permissions in the <filename type="directory">debian</filename>
+				directory.
+			</para>
+		</sect2>
+
 		<sect2 id="debhelper">
 			<title>Debhelper</title>
 			<para>Debhelper uses compatibility levels to control the behaviour of its commands.  We currently recommend to use the level <emphasis>9</emphasis> which