diff options
Diffstat (limited to 'docs/chapters')
| -rw-r--r-- | docs/chapters/building.sgml | 2 | ||||
| -rw-r--r-- | docs/chapters/cfgfile.sgml | 8 | ||||
| -rw-r--r-- | docs/chapters/import.sgml | 2 | ||||
| -rw-r--r-- | docs/chapters/releases.sgml | 1 | ||||
| -rw-r--r-- | docs/chapters/special.sgml | 4 |
5 files changed, 13 insertions, 4 deletions
diff --git a/docs/chapters/building.sgml b/docs/chapters/building.sgml index 9bab07a2..1d95faf5 100644 --- a/docs/chapters/building.sgml +++ b/docs/chapters/building.sgml @@ -9,6 +9,7 @@ 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> @@ -96,6 +97,7 @@ export-dir=../build-area <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> diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.sgml index d69ebef0..d7c7a0da 100644 --- a/docs/chapters/cfgfile.sgml +++ b/docs/chapters/cfgfile.sgml @@ -33,22 +33,22 @@ <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 diff --git a/docs/chapters/import.sgml b/docs/chapters/import.sgml index c4a5f1fc..54d23b8d 100644 --- a/docs/chapters/import.sgml +++ b/docs/chapters/import.sgml @@ -88,6 +88,7 @@ by version number. <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> @@ -176,5 +177,6 @@ EOF <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> diff --git a/docs/chapters/releases.sgml b/docs/chapters/releases.sgml index 95f89b4f..9d3bf747 100644 --- a/docs/chapters/releases.sgml +++ b/docs/chapters/releases.sgml @@ -21,6 +21,7 @@ <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> diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml index cf349042..653f0ae2 100644 --- a/docs/chapters/special.sgml +++ b/docs/chapters/special.sgml @@ -4,6 +4,7 @@ <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> @@ -37,6 +38,7 @@ cleanup-script.sh &gitcmd; checkout <replaceable>master</replaceable> &gitcmd; pull <replaceable>.</replaceable> <replaceable>dfsg_clean</replaceable> </screen> + </sect1> <sect1 id="gbp.special.nmus"> <title>Importing NMUs</title> @@ -108,6 +110,7 @@ builder = /usr/bin/git-pbuilder one of your &git; repositories instead of <filename>~/.gbp.conf</filename>. </para> + </sect1> <sect1 id="gbp.special.hacking"> <title>Working on random packages</title> @@ -119,6 +122,7 @@ git-import-dsc --download <filename>package</filename> 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 |