[website] 01/01: Add 'Importing source packages' section.

[Bas Couwenberg]

This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository website.

commit 3c3ba70ab51e3f148d67662a14f9c54992ac5c30
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Oct 2 16:55:35 2016 +0200

    Add 'Importing source packages' section.
---
 policy.xml | 65 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/policy.xml b/policy.xml
index e7ee297..cf110cc 100644
--- a/policy.xml
+++ b/policy.xml
@@ -2167,6 +2167,71 @@ allowed_distributions = .*
           </para>
         </sect4>
       </sect3>
+      <sect3 id="git-import-dsc">
+        <title>Importing source packages</title>
+        <para>
+          Sometimes changes from published source packages need to be
+          included in the git repository, e.g. NMUs or packages from
+          UbuntuGIS or OSGeo-Live that don't have their dedicated branches
+          yet.
+        </para>
+        <para>
+          First download the source package with <command>dget</command>
+          using the URL to the <filename>.dsc</filename> file copied from the
+          Debian Package Tracker or Launchpad:
+<programlisting>
+<command>cd</command> <filename>/tmp</filename>
+<command>dget</command> <option>-u</option> <option>-d</option> <replaceable>http://example.com/<package>_<revision></replaceable>.dsc
+</programlisting>
+          The <option>-d</option> option is used to only download the source
+          package files, and not extract them as well.
+        </para>
+        <para>
+          Change the current working directory to the package git repository
+          and ensure the approriate branch is checked out and up-to-date.
+<programlisting>
+<command>cd</command> <replaceable><path/to/git/repository></replaceable>
+<command>git checkout</command> <replaceable><branch></replaceable>
+<command>git pull</command>
+</programlisting>
+        </para>
+        <para>
+          Assuming an NMU from the Debian archive is imported on the
+          <literal>master</literal> branch, using the
+          <command>gbp import-dsc</command> defaults is sufficient:
+<programlisting>
+<command>gbp import-dsc</command> <filename>/tmp/<replaceable><package>_<revision></replaceable>.dsc</filename>
+</programlisting>
+        </para>
+        <para>
+          When importing source packages from UbuntuGIS or OSGeo-Live the
+          appropriate <link linkend="other-git-branches">branches</link> and
+          <link linkend="git-tags">tags</link> need to be used.
+        </para>
+        <para>
+          You may also need to create the branch first if it does not exist
+          yet and the package doesn't originate from UbuntuGIS or OSGeo-Live.
+        </para>
+        <para>
+          Create the branch by checking out the <literal>debian/</literal> tag
+          on which the UbuntuGIS or OSGeo-Live package is based:
+<programlisting>
+<command>git checkout</command> <option>-b</option> ubuntu/<replaceable>xenial</replaceable> debian/<replaceable>1.2.3-1</replaceable>
+<command>git checkout</command> <option>-b</option> osgeo/<replaceable>10.0</replaceable> debian/<replaceable>1.2.3-1</replaceable>
+</programlisting>
+        </para>
+        <para>
+          Because the
+          <link linkend="debian-gbp.conf"><filename>debian/gbp.conf</filename></link>
+          file may not have the appropriate configuration yet, the Ubuntu or
+          OSGeo-Live specific branches and tags need to be specified
+          explicitly:
+<programlisting>
+<command>gbp import-dsc</command> <option>--debian-branch=ubuntu/<replaceable>xenial</replaceable></option> <option>--debian-tag="ubuntu/%(version)s"</option> <filename>/tmp/<replaceable><package>_<revision></replaceable>.dsc</filename>
+<command>gbp import-dsc</command> <option>--debian-branch=osgeo/<replaceable>10.0</replaceable></option> <option>--debian-tag="osgeo/%(version)s"</option> /tmp/<replaceable><package>_<revision></replaceable>.dsc
+</programlisting>
+        </para>
+      </sect3>
       <sect3 id="git-patches">
         <title>Patches</title>
         <para>

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/website.git