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

[Charles Plessy]

Author: plessy
Date: 2011-03-20 05:39:43 +0000 (Sun, 20 Mar 2011)
New Revision: 6327

Modified:
   trunk/community/website/docs/policy.xml
Log:
Briefly describe possible Git layouts.


Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml	2011-03-20 02:57:38 UTC (rev 6326)
+++ trunk/community/website/docs/policy.xml	2011-03-20 05:39:43 UTC (rev 6327)
@@ -160,8 +160,8 @@
 				package.
 			</para>
 		</sect2>
-		<sect2 id="repository-structure">
-			<title>Repository structure</title>
+		<sect2 id="svn-repository-structure">
+			<title>Subversion repository structure</title>
 			<para>The SVN repository is structured as follows:
       <literallayout>
       <code>
@@ -189,9 +189,46 @@
 			<note><para>We are currently considering an alternative layout in which all
 			the <filename>trunk</filename>, <filename>tags</filename> and
 			<filename>branches</filename> directories are grouped together, so that developers can checkout trunks without tags.</para></note>
-			<para>The Git repository is not structured: each package is in its own Git repository.
-			   But all of them are under the same <filename>debian-med</filename> directory.</para>
 		</sect2>
+		<sect2 id="git-repository-structures">
+			<title>Common Git repository structures</title>
+			<para>
+				The area on Alioth that contains the Git repositories (<filename
+				class="directory">/git/debian-med</filename>) is not itself structured,
+				but the repositories can be arranged in different possible layouts.
+			</para>
+			<sect3 id="git-buildpackage">
+				<title><command>git-buildpackage</command></title>
+				<para>
+					Most of our packages using Git and stored in Alioth are managed with
+					the <command>git-buildpackage</command> helper.  The
+					<literal>master</literal> branch contains the full source package. 
+					The <literal>upstream</literal> branch contains the upstream source, 
+					after repacking when necessary (non-free files, large convenience code
+					copies, …). The <literal>pristine-tar</literal> contains the data
+					necessary to recreate an original tarball from the repository with a
+					reproducible checksum.
+				</para>
+				<para>
+					Debian releases are tagged with names like
+					<literal>debian/debianversion</literal> and upstream relases are
+					tagged with names like <literal>upstream/upstreamversion</literal>.
+				</para>
+			</sect3>
+			<sect3 id="git-without-tarball">
+				<title>Social Git</title>
+				<para>
+				  For some projects, like the ones hosted on <ulink
+				  url="http://www.github.com">Github</ulink> or <ulink
+				  url="http://www.gitorious.com">Gitorious</ulink>, it may be easier to
+				  forward changes made in the Debian package if this one is itself
+				  hosted on the same platform, as a clone. In that case, the layouts
+				  may vary from package to packages.  However, there are good chances
+				  that the branch that contains the Debian source package is called
+				  <literal>debian</literal>.
+				 </para>
+			</sect3>
+		</sect2>
 		
 		<sect2 id="git-tips">
 			<title>Git tips</title>