Author: plessy
Date: 2011-03-21 11:57:04 +0000 (Mon, 21 Mar 2011)
New Revision: 6346

Modified:
   trunk/community/website/docs/policy.xml
Log:
Separated VCS and new packages issues.


Modified: trunk/community/website/docs/policy.xml
===================================================================
--- trunk/community/website/docs/policy.xml     2011-03-21 11:42:59 UTC (rev 
6345)
+++ trunk/community/website/docs/policy.xml     2011-03-21 11:57:04 UTC (rev 
6346)
@@ -611,14 +611,30 @@
                        <sect3 id="vcs-svn">
                                <title>Source package stored in a Subversion 
repository</title>
                                <para>
-                                       <emphasis>This section is in 
construction, see <link linkend="svn-inject">below</link> for te 
moment.</emphasis>
+                                       We use the 
<literal>MergeWithUpstream</literal> workflow, so please
+                                       keep all the modifications in the 
<filename
+                                       class="directory">debian</filename> 
directory, and use the
+                                       <option>-o</option> option of 
<command>svn-buildpackage</command>, as
+                                       in the following example: 
<code><command>svn-inject</command>
+                                       <option>-o</option> 
<filename>package.dsc</filename> <filename
+                                       
class="directory">svn+ssh://svn.debian.org/svn/debian-med/trunk/packages/</filename></code>.
                                </para>
                        </sect3>
                        <sect3 id="vcs-git">
                                <title>Source package stored in a Git 
repository</title>
                                <para>
-                                       Git repositories managed with a helper 
tool should announce it. For instance, to show that 
<command>git-buildpackage</command> is used, the package can contain a 
configuration file in <filename>debian/gbp.conf</filename>.
+                                       Git repositories should be stored in 
the <filename
+                                       
class="directory">/git/debian-med</filename> directory on Alioth and
+                                       created with the <link
+                                       
linkend="create-git-repository-on-alioth"><command>setup-repository</command></link>
+                                       script available there.
                                </para>
+                               <para>
+                                       Git repositories managed with a helper 
tool should announce it.  For
+                                       instance, to show that 
<command>git-buildpackage</command> is used,
+                                       the package can contain a configuration 
file in
+                                       <filename>debian/gbp.conf</filename>.
+                               </para>
                        </sect3>
                        <sect3 id="vcs-tags">
                                <title>Tags</title>
@@ -630,36 +646,14 @@
                                </para>
                        </sect3>
                </sect2>
-
                <sect2 id="new-package">
                        <title>New package</title>
-            <sect3 id="svn-inject">
-                       <title>Subversion</title>
-                       <para>To inject a new package to the SVN repository, 
you must have
-                       write access to it; i.e. you must be a member of the 
<emphasis>debian-med</emphasis> group on Alioth.</para>
-                       <para>You can inject a new package only after 
successfully building
-                       it with <command>dpkg-buildpackage</command> (or any 
wrapper around it). We use the MergeWithUpstream workflow, so please keep all 
the modifications in the <filename>debian</filename> directory, and use the 
<option>-o</option> of <command>svn-buildpackage</command>, as in the following 
example:</para>
-                       <blockquote>
-                               <para><userinput>
-                                       <command>svn-inject</command>
-                                       <option>-o</option>
-                                       <filename>package.dsc</filename>
-                                       <filename 
class="directory">svn+ssh://[email protected]/svn/debian-med/trunk/packages/</filename>
-                               </userinput></para>
-                       </blockquote>
-                       <para>The <command>svn-inject</command> command is 
found in the
-                       <command>svn-buildpackage</command> package     (just
-                       <command>apt-get</command> it).</para>
-               </sect3>
-               <sect3 id="new-git-repo">
-                       <title>New package stored in a Git repository.</title>
                        <para>
-                               Git repositories should be stored in the
-                               <filename 
class="directory">/git/debian-med</filename> directory on Alioth and created 
with the <link
-                               
linkend="create-git-repository-on-alioth"><command>setup-repository</command></link>
-                               script available there.
+                               Try to inject a new package only after 
successfully building it with
+                               <command>dpkg-buildpackage</command> (or any 
wrapper around it).  Use a
+                               file like <filename>debian/DRAFT</filename> to 
mention when the package
+                               is a draft.
                        </para>
-               </sect3>
                </sect2>
                <sect2 id="new-packages-in-tasks">
                        <title>The Debian Med Blend tasks</title>


_______________________________________________
debian-med-commit mailing list
[email protected]
http://lists.alioth.debian.org/mailman/listinfo/debian-med-commit

Reply via email to