[website] 02/03: Don't use git-pbuilder by default in gbp.conf, cannot easily be overriden.

[Bas Couwenberg]

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

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

commit 7bd88c4207be43f8ddf395ddb9851d9cee2d11ab
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Feb 22 20:39:27 2014 +0100

    Don't use git-pbuilder by default in gbp.conf, cannot easily be overriden.
---
 policy.xml | 45 ++++++++++++---------------------------------
 1 file changed, 12 insertions(+), 33 deletions(-)

diff --git a/policy.xml b/policy.xml
index 0bd5aba..d5cbd75 100644
--- a/policy.xml
+++ b/policy.xml
@@ -767,6 +767,17 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
 <command>sudo cowbuilder</command> <option>--create</option> <option>--distribution=<replaceable><distribution></replaceable></option> <option>--architecture=<replaceable><architecture></replaceable></option> <option>--basepath=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.cow</option>
 </programlisting>
           </para>
+          <para>
+            The default distribution for <command>git-buildpackage</command>
+            is <literal>sid</literal>, other distributions can be specified with
+            <option>--git-dist=<replaceable><distribution></replaceable></option>
+          </para>
+          <para>
+            To create the default chroot for <command>git-buildpackage</command>:
+<programlisting>
+<command>sudo cowbuilder</command> <option>--create</option> <option>--distribution=sid</option> <option>--basepath=/var/cache/pbuilder/base-sid.cow</option>
+</programlisting>
+          </para>
           <sect5 id="git-pbuilder-hooks">
             <title>Configure lintian pbuilder hook</title>
 
@@ -792,7 +803,7 @@ Cmnd_Alias PBUILDERS=/usr/sbin/pbuilder, /usr/sbin/cowbuilder
               Specify the <command>pbuilder</command> hook directory when
               creating the chroot to run the hook scripts contained therein.
 <programlisting>
-<command>sudo cowbuilder</command> <option>--create</option> <option>--distribution=<replaceable><distribution></replaceable></option> <option>--basepath=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.cow</option> <option>--hookdir=~/pbuilder-hooks/</option>
+<command>sudo cowbuilder</command> <option>--create</option> <option>--distribution=<replaceable>sid</replaceable></option> <option>--basepath=/var/cache/pbuilder/base-<replaceable>sid</replaceable>.cow</option> <option>--hookdir=~/pbuilder-hooks/</option>
 </programlisting>
             </para>
           </sect5>
@@ -1322,35 +1333,6 @@ get-orig-source:
 </programlisting>
           </para>
         </sect4>
-        <sect4 id="git-pdebuild">
-          <title>
-            To make <command>git-buildpackage</command> build the package
-            with <command>pdebuild</command>
-          </title>
-          <para>
-            Add the following to the configuration file
-            <filename>~/.gbp.conf</filename> or
-            <filename>debian/gbp.conf</filename>:
-<programlisting>
-[DEFAULT]
-builder = ~/bin/git-pbuilder
-</programlisting>
-            With this configuration file you're specifying that
-            <command>git-buildpackage</command> will use
-            <filename>~/bin/git-pbuilder</filename> as the builder script.
-            This is an example script you can use:
-<programlisting>
-#!/bin/sh
-set -e
-
-pdebuild --pbuilder cowbuilder --debbuildopts "-i\.git -I.git $*"
-rm ../*_source.changes
-</programlisting>
-            This will build the package inside the default cowbuilder chroot,
-            while passing any more parameters directly do
-            <command>dpkg-buildpackage</command>.
-          </para>
-        </sect4>
       </sect3>
     </sect2>
     <sect2 id="svn-packaging">
@@ -1819,9 +1801,6 @@ upstream-tag = upstream/%(version)s
 
 # Always use pristine-tar.
 pristine-tar = True
-
-# Always use pbuilder
-builder = /usr/bin/git-pbuilder
 </programlisting>
       </para>
     </sect2>

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