During the development phase (when you're either not on the
<emphasis>debian-branch</emphasis> or when you have uncommitted changes in
your repository) you'll usually use:
+ </para>
<screen>
&git-buildpackage; <option>--git-ignore-new</option>
</screen>
<option>postbuild</option>=<replaceable>lintian $GBP_CHANGES_FILE</replaceable>
</programlisting>
to your <filename>.gbp.conf</filename>.
+ </para>
</sect2>
<sect2 id="gbp.building.push">
<title>Pushing into a remote repository</title>
<varlistentry>
<term>[git-buildpackage]</term>
<listitem><para>Options in this section apply to &git-buildpackage; only and override options from the
- [DEFAULT] section.</listitem>
+ [DEFAULT] section.</para></listitem>
</varlistentry>
<varlistentry>
<term>[git-import-orig]</term>
<listitem><para>Options in this section apply to &git-import-orig; only and override options from the
- [DEFAULT] section.</listitem>
+ [DEFAULT] section.</para></listitem>
</varlistentry>
<varlistentry>
<term>[git-import-dsc]</term>
<listitem><para>Options in this section apply to &git-import-dsc; only and override options from the
- [DEFAULT] section.</listitem>
+ [DEFAULT] section.</para></listitem>
</varlistentry>
<varlistentry>
<term>[git-dch]</term>
<listitem><para>Options in this section apply to &git-dch; only and override options from the
- [DEFAULT] section.</listitem>
+ [DEFAULT] section.</para></listitem>
</varlistentry>
</variablelist>
The actual options in these sections are the command line options without
<para>
If the &git; repository wasn't created with &git-import-dsc; you have to tell
&git-buildpackage; and friends where to find the upstream sources.
+ </para>
<sect2>
<title>Upstream sources on a branch</title>
<para>
<command>dh_make</command>
</screen>
That's it, you're done. If you want to publish you're new repository you can use &gbp-create-remote-repo;.
+ </para>
</sect1>
</chapter>
<option>--release</option>.</para>
<para>
But what if you want to have an (unreleased) snapshot for intermediate testing:
+ </para>
<screen>
&git-dch; <option>--snapshot</option>
</screen>
<title>Handling non-DFSG clean upstream sources</title>
<para>If you have to handle non DFSG clean upstream sources you can use a
different branch which you have to create once:
+ </para>
<screen>
&gitcmd; branch dfsg_clean upstream
</screen>
&gitcmd; checkout <replaceable>master</replaceable>
&gitcmd; pull <replaceable>.</replaceable> <replaceable>dfsg_clean</replaceable>
</screen>
+ </sect1>
<sect1 id="gbp.special.nmus">
<title>Importing NMUs</title>
one of your &git; repositories instead of
<filename>~/.gbp.conf</filename>.
</para>
+ </sect1>
<sect1 id="gbp.special.hacking">
<title>Working on random packages</title>
cd <filename>package</filename>
git-branch debian
</programlisting>
+ </para>
<para>
This uses <command>apt-get</command> to download the source package,
puts the orig tarball on the <option>upstream-branch</option> and the
</term>
<listitem>
<para>Track all branches, not only <replaceable>debian</replaceable>
- and <replaceable>upstream</replaceable>.
+ and <replaceable>upstream</replaceable>.</para>
</listitem>
</varlistentry>
<varlistentry>
</term>
<listitem>
<para>The branch in the Git repository the Debian package is being
- developed on, default is <replaceable>master</replaceable>.
+ developed on, default is <replaceable>master</replaceable>.</para>
</listitem>
</varlistentry>
<varlistentry>
</listitem>
</varlistentry>
</variablelist>
+ </refsect1>
<refsect1>
&man.git.config-files;
</refsect1>
</term>
<listitem>
<para>The branch in the Git repository the Debian package is being
- developed on, default is <replaceable>master</replaceable>.
+ developed on, default is <replaceable>master</replaceable>.</para>
</listitem>
</varlistentry>
<varlistentry>
</listitem>
</varlistentry>
</variablelist>
+ </refsect1>
<refsect1>
&man.git.config-files;
</refsect1>
</term>
<listitem>
<para>The branch in the Git repository the Debian package is being
- developed on, default is <replaceable>master</replaceable>.
+ developed on, default is <replaceable>master</replaceable>.</para>
</listitem>
</varlistentry>
<varlistentry>
<listitem>
<para>Don't abort if there are uncommitted changes in the source tree
or the current branch doesn't match the
- <replaceable>debian-branch</replaceable>.
+ <replaceable>debian-branch</replaceable>.</para>
</listitem>
</varlistentry>
<varlistentry>
<listitem>
<para>Build for architecture <replaceable>ARCH</replaceable> when
using <command>--git-pbuilder</command>. If unset no architecture is
- passed to <command>git-pbuilder</command>.
+ passed to <command>git-pbuilder</command>.</para>
</listitem>
</varlistentry>
<varlistentry>
<para>Whether to try to autoconfigure
<command>git-pbuilder</command> or to rely on the settings in
.pbuilderrc. See the <command>git-pbuilder</command>
- manpage for details.</listitem>
+ manpage for details.</para></listitem>
</varlistentry>
<varlistentry>
<term><option>--git-pbuilder-options</option></term>
or the application specified via <option>--git-builder</option>.</para>
<para>Exported environment variables are:
<envar>GBP_GIT_DIR</envar> (the repository the package is being built from),
- <envar>GBP_BUILD_DIR</envar> (the build dir).
+ <envar>GBP_BUILD_DIR</envar> (the build dir).</para>
</listitem>
+ </varlistentry>
<varlistentry>
<term><option>--git-debian-tag=</option><replaceable>tag-format</replaceable>
</term>