The following commit has been merged in the master branch: commit 56694dee60c40932feb6e08da2456f64c11f58ef Author: Bas Couwenberg <sebas...@xs4all.nl> Date: Sun Jan 5 23:55:00 2014 +0100
Move pbuilder documentation to new Setup the build environment, and Building the package sections. diff --git a/policy.xml b/policy.xml index 9fa4381..a745d08 100644 --- a/policy.xml +++ b/policy.xml @@ -667,130 +667,6 @@ pkg-grass/ <literal>chroot</literal> instead of on the development system itself using plain <command>debuild</command>. </para> - <para> - <command>cowbuilder</command> is preferred for over - <command>pbuilder</command> by - <command>git-buildpackage</command> for its increased - performance using Copy-On-Write techniques. - </para> - <para> - <command>pbuilder</command> can be selected instead by setting - the environment variable <literal>BUILDER</literal> to - "<literal>pbuilder</literal>", and - <command>qemubuilder</command> can be selected by setting - <literal>BUILDER</literal> to "<literal>qemubuilder</literal>". - </para> - <para> - Use <command>git-buildpackage</command>'s - <option>--git-dist=<replaceable><distribution></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. - </para> - <para> - The default path for <command>cowbuilder</command> chroots is - <filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.cow</filename>. - And for <command>pbuilder</command> chroots - <filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.tgz</filename>. - </para> - <para> - Use <command>cowbuilder</command> - <option>--create</option> - <option>--distribution=<replaceable><distribution></replaceable></option> - <option>--basepath=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.cow</option> - to create <command>cowbuilder</command> chroots for specific - distributions. - </para> - <para> - Use <command>pbuilder</command> - <option>--create</option> - <option>--distribution=<replaceable><distribution></replaceable></option> - <option>--basetgz=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.tgz</option> - when using <command>pbuilder</command> instead. - </para> - <para> - Use <command>git-buildpackage</command>'s - <option>--git-arch=<replaceable><architecture></replaceable></option> - option for building packages targetting a different architecture, - such as building <literal>i386</literal> packages on - <literal>amd64</literal>. - </para> - <para> - The default path for architecture specific - <command>cowbuilder</command> chroots is - <filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.cow</filename>. - And for <command>pbuilder</command> chroots - <filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.tgz</filename>. - </para> - <para> - Use <command>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> - to create <command>cowbuilder</command> distribution and - architecture specific chroots. - </para> - <para> - Or <command>cowbuilder</command> - <option>--create</option> - <option>--architecture=<replaceable><architecture></replaceable></option> - <option>--basepath=/var/cache/pbuilder/base-<replaceable><architecture></replaceable>.cow</option> - to create <command>cowbuilder</command> chroots for only - specific architectures. - </para> - <para> - Replace <option>--basepath</option> with - <option>--basetgz</option> for the respective - <command>pbuilder</command> commands. - </para> - <para> - Use <command>git-buildpackage</command>'s - <option>--git-debian-branch=<replaceable><branch_name></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. - </para> - <para> - Packages targetting <link linkend="ubuntugis-ppa">UbuntuGIS</link> - or derivatives such as - <ulink url="http://live.osgeo.org/">OSGeo-Live</ulink> can be - built from their distribution specific branches. - <itemizedlist> - <listitem> - <para> - UbuntuGIS branches should be named - <literal>ubuntu/<codename></literal>, - for example <literal>ubuntu/precise</literal>, - <literal>ubuntu/quantal</literal>, etc. - </para> - </listitem> - <listitem> - <para> - OSGeo-Live branches should be named - <literal>osgeo/<version></literal>, - for example <literal>osgeo/7.0</literal>, - <literal>osgeo/8.0</literal>, etc. - </para> - </listitem> - <listitem> - <para> - Branches for other derivatives should be named - <literal><derivative>/<codename|version></literal>. - </para> - <para> - Using release codenames is preferred over release versions, - but the latter are reasonable when codenames are not used. - </para> - <para> - If the packaging workflow benefits more from tracking - release aliases such as <literal>stable</literal>, - <literal>testing</literal> or <literal>unstable</literal> - this is also possible. - </para> - </listitem> - </itemizedlist> - </para> </listitem> </itemizedlist> </sect3> @@ -799,6 +675,31 @@ pkg-grass/ <para> ... </para> + <sect4 id="git-pbuilder"> + <title>Setup the build environment</title> + <para> + Building the source packages in clean chroot environments is + supported out of the box by + <command>git-buildpackage</command>'s + <option>--git-pbuilder</option> option. + </para> + <literallayout><command>cowbuilder</command> is preferred for over <command>pbuilder</command> by <command>git-buildpackage</command> for its increased performance using Copy-On-Write techniques. +<command>pbuilder</command> can be selected instead by setting the environment variable <literal>BUILDER</literal> to "<literal>pbuilder</literal>", and +<command>qemubuilder</command> can be selected by setting <literal>BUILDER</literal> to "<literal>qemubuilder</literal>". +</literallayout> + <literallayout>The default path for <command>cowbuilder</command> chroots is <filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.cow</filename>. +And for <command>pbuilder</command> chroots <filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.tgz</filename>. +</literallayout> + <literallayout>Use <command>sudo cowbuilder</command> <option>--create</option> <option>--distribution=<replaceable><distribution></replaceable></option> <option>--basepath=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.cow</option> to create <command>cowbuilder</command> chroots for specific distributions. +Use <command>sudo pbuilder</command> <option>--create</option> <option>--distribution=<replaceable><distribution></replaceable></option> <option>--basetgz=/var/cache/pbuilder/base-<replaceable><distribution></replaceable>.tgz</option> when using <command>pbuilder</command> instead. +</literallayout> + <literallayout>The default path for architecture specific <command>cowbuilder</command> chroots is <filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.cow</filename>. +And for <command>pbuilder</command> chroots <filename>/var/cache/pbuilder/base-<replaceable><distribution></replaceable>-<replaceable><architecture></replaceable>.tgz</filename>. +</literallayout> + <literallayout>Use <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> to create <command>cowbuilder</command> distribution and architecture specific chroots. +For <command>pbuilder</command> replace <option>--basepath</option> with <option>--basetgz</option> and <option>.cow</option> with <option>.tgz</option> in the above commands. +</literallayout> + </sect4> <sect4 id="git-new-package"> <title>Starting a new package</title> <para> @@ -897,6 +798,67 @@ pkg-grass/ <para> ... </para> + <para> + Use <command>git-buildpackage</command>'s + <option>--git-dist=<replaceable><distribution></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. + </para> + <para> + Use <command>git-buildpackage</command>'s + <option>--git-arch=<replaceable><architecture></replaceable></option> + option for building packages targetting a different architecture, + such as building <literal>i386</literal> packages on + <literal>amd64</literal>. + </para> + <para> + Use <command>git-buildpackage</command>'s + <option>--git-debian-branch=<replaceable><branch_name></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. + </para> + <para> + Packages targetting <link linkend="ubuntugis-ppa">UbuntuGIS</link> + or derivatives such as + <ulink url="http://live.osgeo.org/">OSGeo-Live</ulink> can be + built from their distribution specific branches. + <itemizedlist> + <listitem> + <para> + UbuntuGIS branches should be named + <literal>ubuntu/<codename></literal>, + for example <literal>ubuntu/precise</literal>, + <literal>ubuntu/quantal</literal>, etc. + </para> + </listitem> + <listitem> + <para> + OSGeo-Live branches should be named + <literal>osgeo/<version></literal>, + for example <literal>osgeo/7.0</literal>, + <literal>osgeo/8.0</literal>, etc. + </para> + </listitem> + <listitem> + <para> + Branches for other derivatives should be named + <literal><derivative>/<codename|version></literal>. + </para> + <para> + Using release codenames is preferred over release versions, + but the latter are reasonable when codenames are not used. + </para> + <para> + If the packaging workflow benefits more from tracking + release aliases such as <literal>stable</literal>, + <literal>testing</literal> or <literal>unstable</literal> + this is also possible. + </para> + </listitem> + </itemizedlist> + </para> </sect4> <sect4 id="git-repository-layout"> <title>Repository layout</title> -- pkg-grass website _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel