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

sebastic-guest pushed a commit to branch master
in repository website.

commit f34eae576c73178cb490ab0cdf8471b37f237b80
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri May 9 16:42:48 2014 +0200

    Expand the 'Building the package' section.
---
 policy.xml | 115 ++++++++++++++++++++++++++++++++++++++++++++-----------------
 1 file changed, 83 insertions(+), 32 deletions(-)

diff --git a/policy.xml b/policy.xml
index 1292b84..4392112 100644
--- a/policy.xml
+++ b/policy.xml
@@ -695,8 +695,8 @@ pkg-grass/
               tarball from the <literal>upstream</literal> branch.
             </para>
             <para>
-              Use <command>git-buildpackage</command>'s
-              <option>--git-pristine-tar</option> option to generate missing
+              Use <command>git-buildpackage</command>
+              <option>--git-pristine-tar</option> to generate missing
               upstream tarballs with the <command>pristine-tar</command>
               command from the <literal>upstream</literal> and
               <literal>pristine-tar</literal> branches in the Git repository.
@@ -715,8 +715,8 @@ pkg-grass/
               distribution specific <literal>chroot</literal> environments.
             </para>
             <para>
-              Use <command>git-buildpackage</command>'s
-              <option>--git-pbuilder</option> option to use
+              Use <command>git-buildpackage</command>
+              <option>--git-pbuilder</option> to use
               <command>cowbuilder</command> for building the package in a clean
               <literal>chroot</literal> instead of on the development system
               itself using plain <command>debuild</command>.
@@ -753,14 +753,14 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, 
/usr/sbin/cowbuilder
 # User privilege specification
 <replaceable>&lt;username&gt;</replaceable>     ALL=(root)     
NOPASSWD:PBUILDERS
 </programlisting>
-          <para>
+          <para id="git-cowbuilder-dist">
             To create <emphasis>distribution</emphasis> specific
             <command>cowbuilder</command> chroots, use:
 <programlisting>
 <command>sudo cowbuilder</command> <option>--create</option> 
<option>--distribution=<replaceable>&lt;distribution&gt;</replaceable></option> 
<option>--basepath=/var/cache/pbuilder/base-<replaceable>&lt;distribution&gt;</replaceable>.cow</option>
 </programlisting>
           </para>
-          <para>
+          <para id="git-cowbuilder-arch">
             To create <emphasis>architecture</emphasis>
             specific <command>cowbuilder</command> chroots, use:
 <programlisting>
@@ -1043,42 +1043,93 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, 
/usr/sbin/cowbuilder
         <sect4 id="git-build-package">
           <title>Building the package</title>
           <para>
-            ...
+            It's highly recommended to always build the package in clean
+            <command>cowbuilder</command> chroot using:
+<programlisting>
+<command>git-buildpackage</command> <option>--git-pbuilder</option>
+</programlisting>
+            Without the <option>--git-pbuilder</option> option plain
+            <command>debuild</command> is used on the development system itself
+            instead of a distribution specific chroot.
           </para>
           <para>
-            Use <command>git-buildpackage</command>'s
-            <option>--git-pristine-tar</option> option to generate missing
-            upstream tarballs with the <command>pristine-tar</command>
-            command from the <literal>upstream</literal> and
-            <literal>pristine-tar</literal> branches in the Git repository.
+            To build the package for a different distribution than the default
+            <literal>sid</literal> such as <literal>experimental</literal> or
+            <literal>wheezy-backports</literal>, use the
+            <option>--git-dist</option> option.
+<programlisting>
+<command>git-buildpackage</command> <option>--git-pbuilder</option> 
<option>--git-dist=<replaceable>&lt;distribution&gt;</replaceable></option>
+</programlisting>
+            Refer to the
+            <link linkend="git-pbuilder">Setup the build environment</link>
+            section for creating the
+            <link linkend="git-cowbuilder-dist">distribution specific</link>
+            chroots.
           </para>
           <para>
-            Use <command>git-buildpackage</command>'s
-            <option>--git-pbuilder</option> option to use
-            <command>cowbuilder</command> for building the package in a clean
-            <literal>chroot</literal> instead of on the development system
-            itself using plain <command>debuild</command>.
+            <command>git-buildpackage</command> uses the configuration in
+            <link 
linkend="debian-gbp.conf"><filename>debian/gbp.conf</filename></link>
+            to override its default settings, and commandline parameters to
+            overide both the built-in defaults and those loaded from
+            <filename>debian/gbp.conf</filename>.
           </para>
           <para>
-            Use <command>git-buildpackage</command>'s
-            
<option>--git-dist=<replaceable>&lt;distribution&gt;</replaceable></option>
-            option for building packages in distribution specific chroots,
-            such as <literal>stable-updates</literal> using the branch 
-            named the same as the release codename or version.
+            It's not recommended to set the <literal>git-builder</literal>
+            option in <filename>debian/gbp.conf</filename> to use
+            <literal>git-pbuilder</literal> by default, because this setting
+            cannot by overriden using a commandline parameter.
           </para>
           <para>
-            Use <command>git-buildpackage</command>'s
-            
<option>--git-arch=<replaceable>&lt;architecture&gt;</replaceable></option>
-            option for building packages targeting a different architecture,
-            such as building <literal>i386</literal> packages on
-            <literal>amd64</literal>.
+            The use of <command>pristine-tar</command> to recreate a 
byte-identical
+            <filename>orig.tar.gz</filename> from the 
<literal>upstream</literal>
+            branch is highly recommended.
           </para>
           <para>
-            Use <command>git-buildpackage</command>'s
-            
<option>--git-debian-branch=<replaceable>&lt;branch_name&gt;</replaceable></option>
-            option when the content of the <filename>debian/</filename>
-            directory for the target distribution is not maintained in the
-            <literal>master</literal> branch.
+            If the <literal>pristine-tar</literal> is not set via the
+            <filename>debian/gbp.conf</filename> you can use the
+            <option>--git-pristine-tar</option> option.
+<programlisting>
+<command>git-buildpackage</command> <option>--git-pbuilder</option> 
<option>--git-pristine-tar</option>
+</programlisting>
+            Or if you need to override the automatic use of
+            <command>pristine-tar</command> via the
+            <filename>debian/gbp.conf</filename> use the
+            <option>--git-no-pristine-tar</option> option.
+          </para>
+          <para>
+            Use the <option>--git-arch</option> option to build the package for
+            a different architecture than that of the development system, such
+            as <literal>i386</literal> on <literal>amd64</literal>.
+<programlisting>
+<command>git-buildpackage</command> <option>--git-pbuilder</option> 
<option>--git-arch=<replaceable>&lt;architecture&gt;</replaceable></option>
+</programlisting>
+            Refer to the
+            <link linkend="git-pbuilder">Setup the build environment</link>
+            section for creating the
+            <link linkend="git-cowbuilder-arch">architecture specific</link>
+            chroots.
+          </para>
+          <para>
+            When the source of the package is not in the
+            <literal>master</literal> branch, use the
+            <option>--git-debian-branch</option> option to specify another
+            branch.
+<programlisting>
+<command>git-buildpackage</command> <option>--git-pbuilder</option> 
<option>--git-debian-branch=<replaceable>&lt;branch&gt;</replaceable></option>
+</programlisting>
+            For building a package for <literal>experimental</literal> using
+            dependencies from <literal>unstable</literal> only, the above is
+            sufficient.
+          </para>
+          <para>
+            To build the package using a different distribution and branch use:
+<programlisting>
+<command>git-buildpackage</command> <option>--git-pbuilder</option> 
<option>--git-dist=<replaceable>&lt;distribution&gt;</replaceable></option> 
<option>--git-debian-branch=<replaceable>&lt;branch&gt;</replaceable></option>
+</programlisting>
+            For example, use the <literal>wheezy</literal> distribution and
+            the <literal>wheezy-backports</literal> branch to build a backport.
+            Or using both the <literal>wheezy</literal> distribution and branch
+            to build the package for 
<literal>stable-proposed-updates</literal>.
           </para>
           <para>
             Packages targeting <link linkend="ubuntugis-ppa">UbuntuGIS</link>

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to