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

[Charles Plessy]

Author: plessy
Date: 2013-11-30 04:29:48 +0000 (Sat, 30 Nov 2013)
New Revision: 15342

Modified:
   trunk/community/website/docs/policy.xml
Log:
debian/gbp.conf file for non-standard layouts.


Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml	2013-11-30 04:18:15 UTC (rev 15341)
+++ trunk/community/website/docs/policy.xml	2013-11-30 04:29:48 UTC (rev 15342)
@@ -700,11 +700,19 @@
 		<sect2 id="debian-gbp.conf">
 		  <title><filename>debian/gbp.conf</filename></title>
 			<para>
-			  Packages managed with <command>git-buildpackage</command> may mark this
-			  by including a <filename>debian/gbp.conf</filename> configuration
-			  file.  The following recommended values will make
-			  <command>pristine-tar</command> used by default.<programlisting>
+			  Include this file to document the layout of the repository.  Packages managed
+			  with <command>git-buildpackage</command> may omit default values.<programlisting>
 [DEFAULT]
+# The default name for the upstream branch is "upstream".
+# Change it if the name is different (for instance, "master").
+upstream-branch = upstream
+# The default name for the Debian branch is "master".
+# Change it if the name is different (for instance, "debian/unstable").
+debian-branch = master
+# git-import-orig uses the following names for the upstream tags.
+# Change the value if you are not using git-import-orig
+upstream-tag = upstream/%(version)s
+# Always use pristine-tar.
 pristine-tar = True</programlisting>
 			</para>
 		</sect2>