aboutsummaryrefslogtreecommitdiffhomepage
path: root/docs/manpages/gbp-buildpackage.sgml
diff options
context:
space:
mode:
Diffstat (limited to 'docs/manpages/gbp-buildpackage.sgml')
-rw-r--r--docs/manpages/gbp-buildpackage.sgml20
1 files changed, 11 insertions, 9 deletions
diff --git a/docs/manpages/gbp-buildpackage.sgml b/docs/manpages/gbp-buildpackage.sgml
index 9de8d9f7..5f591e98 100644
--- a/docs/manpages/gbp-buildpackage.sgml
+++ b/docs/manpages/gbp-buildpackage.sgml
@@ -52,7 +52,7 @@
<arg><option>--git-tarball-dir=</option><replaceable>DIRECTORY</replaceable></arg>
<arg><option>--git-compression=</option><replaceable>TYPE</replaceable></arg>
<arg><option>--git-compression-level=</option><replaceable>LEVEL</replaceable></arg>
- <arg><option>--git-subtarball=</option><replaceable>SUBTARBALL</replaceable></arg>
+ <arg rep='repeat'><option>--git-component=</option><replaceable>component</replaceable></arg>
<arg><option>--git-export-dir=</option><replaceable>DIRECTORY</replaceable></arg>
<arg><option>--git-export=</option><replaceable>TREEISH</replaceable></arg>
<arg><option>--git-[no-]pristine-tar</option></arg>
@@ -575,20 +575,22 @@
</listitem>
</varlistentry>
<varlistentry>
- <term><option>--git-subtarball=</option><replaceable>SUBTARBALL</replaceable>
+ <term><option>--git-component=</option><replaceable>COMPONENT</replaceable>
</term>
<listitem>
<para>
When generating tarballs create an additional original
- tarball of directory <replaceable>SUBTARBALL</replaceable>
+ tarball of directory <replaceable>COMPONENT</replaceable>
in the source tree. Using additional original tarballs is
- a feature of the 3.0 (quilt) souce format. See
+ a feature of the 3.0 (quilt) source format. See
the <command>dpkg-source</command> manpage for details. Note that the
<replaceable>--git-pristine-tar-commit</replaceable>
- option is currently incompatible with this option. It also can't be
- set via &gbp.conf; since it's considered an experimental feature and
- might change incompatibly.
- </para>
+ option is currently incompatible with this option.
+ </para>
+ <para>
+ This is considered an experimental feature and might
+ change incompatibly.
+ </para>
</listitem>
</varlistentry>
<varlistentry>
@@ -682,7 +684,7 @@
</para>
<programlisting>
[buildpackage]
- debian-dir = debian/sid
+ debian-branch = debian/sid
</programlisting>
</refsect1>
<refsect1>