aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog7
-rw-r--r--docs/common.ent2
-rw-r--r--docs/manpages/git-buildpackage.sgml35
-rw-r--r--docs/manpages/git-import-dsc.sgml36
-rw-r--r--docs/manpages/git-import-orig.sgml44
5 files changed, 87 insertions, 37 deletions
diff --git a/debian/changelog b/debian/changelog
index 5b1d844..d93cd1f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+git-buildpackage (0.2.22) unstable; urgency=low
+
+ * UNRELEASED
+ * update manpages
+
+ -- Guido Guenther <agx@sigxcpu.org> Mon, 25 Dec 2006 18:03:05 +0100
+
git-buildpackage (0.2.21) unstable; urgency=low
* While dpkg-buildpackage's -i argument takes a regexp -I doesn't - fix
diff --git a/docs/common.ent b/docs/common.ent
index f091df7..70bf212 100644
--- a/docs/common.ent
+++ b/docs/common.ent
@@ -2,7 +2,7 @@
<!ENTITY dhsurname "<surname>Guenther</surname>">
<!ENTITY dhdate "<date>2006-10-02</date>">
<!ENTITY dhsection "<manvolnum>1</manvolnum>">
- <!ENTITY dhemail "<email>agx@sigxcpu.org</email>">
+ <!ENTITY dhemail "<email>&lt;agx@sigxcpu.org&gt;</email>">
<!ENTITY dhusername "Guido Guenther">
<!ENTITY git-buildpackage "<command>git-buildpackage</command>">
<!ENTITY git-import-orig "<command>git-import-orig</command>">
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index 8be4f65..6a9dead 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -27,18 +27,18 @@
<arg><option>--git-ignore-new</option></arg>
<arg><option>--git-tag</option></arg>
<arg><option>--git-verbose</option></arg>
- <arg><option>--upstream-branch=<replaceable>branch_name</replaceable></option></arg>
- <arg><option>--debian-branch=<replaceable>branch_name</replaceable></option></arg>
- <arg><option>--git-builder=<replaceable>BUILD_CMD</replaceable></option></arg>
- <arg><option>--git-cleaner=<replaceable>CLEAN_CMD</replaceable></option></arg>
+ <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
+ <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
+ <arg><option>--git-builder=</option><replaceable>BUILD_CMD</replaceable></arg>
+ <arg><option>--git-cleaner=</option><replaceable>CLEAN_CMD</replaceable></arg>
<arg><option>--git-sign-tags</option></arg>
- <arg><option>--git-keyid</option></arg>
+ <arg><option>--git-keyid=</option><replaceable>gpg-keyid</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- &git-buildpackage; is used to build Debian source and .deb packages from a GIT repository.
+ &git-buildpackage; is used to build Debian source and .deb packages from a &git; repository.
</para>
<para>
&git-buildpackage; will, in order:
@@ -55,9 +55,9 @@
</listitem>
<listitem><para>Build an orig.tar.gz if it doesn't exist.</para>
</listitem>
- <listitem><para>Call <application>debuild</application> (1)
- (or the application specified via --git-builder)
- with arguments instructing it to ignore Git meta-data in
+ <listitem><para>Call <application>debuild</application>(1)
+ (or the application specified via <option>--git-builder</option>)
+ with arguments instructing it to ignore &git; meta-data in
the diff.gz, passing along all arguments given to
&git-buildpackage; that don't start with --git-.
</para>
@@ -99,7 +99,7 @@
<term><option>--git-verbose</option>
</term>
<listitem>
- <para>Verbose execution</para>
+ <para>verbose execution</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -121,11 +121,26 @@
</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term><option>--git-sign-tags</option>
+ </term>
+ <listitem>
+ <para>GPG sign all created tags</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--git-keyid=</option><replaceable>gpg-keyid</replaceable>
+ </term>
+ <listitem>
+ <para>use this keyid for gpg signing tags</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</refsect1>
<refsect1>
&man.git.config-files;
<para>All options in the config files are specified without the 'git-' prefix.</para>
+ </refsect1>
<refsect1>
<title>SEE ALSO</title>
diff --git a/docs/manpages/git-import-dsc.sgml b/docs/manpages/git-import-dsc.sgml
index 656f649..06b0165 100644
--- a/docs/manpages/git-import-dsc.sgml
+++ b/docs/manpages/git-import-dsc.sgml
@@ -27,19 +27,19 @@
&git-import-dsc;
<arg><option>--verbose</option></arg>
- <arg><option>--upstream-branch=<replaceable>branch_name</replaceable></option></arg>
+ <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
<arg><option>--sign-tags</option></arg>
- <arg><option>--keyid</option></arg>
- <arg choice="plain"><replaceable>dsc_file</replaceable></arg>
+ <arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
+ <arg choice="plain"><replaceable>debian-source.dsc</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- &git-import-dsc; imports a Debian source package into a &git-buildpackage;
- repository, notes the package version in the commit logs, and commits the
- change. All information, including package name, version, Debian diffs,
- and upstream source, is automatically detected from the source package.
+ &git-import-dsc; imports a Debian source package into a &git; repository,
+ notes the package version in the commit logs, and commits the change. All
+ information, including package name, version, Debian diffs, and upstream
+ source is automatically detected from the source package.
</para>
</refsect1>
<refsect1>
@@ -50,18 +50,32 @@
<term><option>--upstream-branch</option>=<replaceable>branch_name</replaceable>
</term>
<listitem>
- <para>The branch in the Git repository the upstream sources are put
- onto. Default is <replaceable>upstream</replaceable></para>
+ <para>The branch in the &git; repository the upstream sources are put
+ onto. Default is <replaceable>upstream</replaceable>.</para>
</listitem>
</varlistentry>
<varlistentry>
<term><option>--verbose</option>, <option>-v</option>
</term>
<listitem>
- <para>Verbose execution.</para>
+ <para>verbose execution</para>
</listitem>
</varlistentry>
- </variablelist>
+ <varlistentry>
+ <term><option>--sign-tags</option>
+ </term>
+ <listitem>
+ <para>GPG sign all created tags</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--keyid=</option><replaceable>gpg-keyid</replaceable>
+ </term>
+ <listitem>
+ <para>use this keyid for gpg signing tags</para>
+ </listitem>
+ </varlistentry>
+ </variablelist>
</refsect1>
<refsect1>
&man.git.config-files;
diff --git a/docs/manpages/git-import-orig.sgml b/docs/manpages/git-import-orig.sgml
index 979bf61..eb551ed 100644
--- a/docs/manpages/git-import-orig.sgml
+++ b/docs/manpages/git-import-orig.sgml
@@ -20,29 +20,30 @@
<refnamediv>
<refname>&git-import-orig;</refname>
- <refpurpose>Import an upstream source into a git-buildpackage repository</refpurpose>
+ <refpurpose>Import an upstream source into a git repository</refpurpose>
</refnamediv>
<refsynopsisdiv>
<cmdsynopsis>
&git-import-orig;
<arg><option>--verbose</option></arg>
- <arg><option>--upstream-branch=<replaceable>branch_name</replaceable></option></arg>
- <arg><option>--debian-branch=<replaceable>branch_name</replaceable></option></arg>
- <arg><option>--upstream-version=<replaceable>version</replaceable></option></arg>
+ <arg><option>--upstream-branch=</option><replaceable>branch_name</replaceable></arg>
+ <arg><option>--debian-branch=</option><replaceable>branch_name</replaceable></arg>
+ <arg><option>--upstream-version=</option><replaceable>version</replaceable></arg>
<arg><option>--sign-tags</option></arg>
- <arg><option>--keyid</option></arg>
- <arg choice="plain"><replaceable>tar_gz</replaceable></arg>
+ <arg><option>--keyid=</option><replaceable>gpg-keyid</replaceable></arg>
+ <arg choice="plain"><replaceable>upstream-source</replaceable></arg>
</cmdsynopsis>
</refsynopsisdiv>
<refsect1>
<title>DESCRIPTION</title>
<para>
- &git-import-orig; imports a tar.gz file given by
- <replaceable>tar_gz</replaceable> into the git-buildpackage repository. If
- <replaceable>tar_gz</replaceable> is already of the form
- package_version.orig.tar.gz, it reads the version information from the
- tarball's filename otherwise it can be specified on the commandline.
+ &git-import-orig; imports the tar.gz archive given by
+ <replaceable>upstream-source</replaceable> into the &git; repository. If
+ <replaceable>upstream-source</replaceable> is already of the form
+ <replaceable>package-name_version.orig.tar.gz</replaceable>, it reads the
+ version information from the tarball's filename otherwise it can be
+ specified on the commandline via <option>--upstream-version</option>.
When importing the new version <command>git_load_dirs</command> is being
used to detect file renames and removals.
@@ -54,8 +55,7 @@
<variablelist>
<varlistentry>
<term><option>--upstream-version</option>=<replaceable>version</replaceable>,
- <option>-u</option><replaceable>version</replaceable>
- </term>
+ <option>-u</option><replaceable>version</replaceable></term>
<listitem>
<para>The upstream version number</para>
</listitem>
@@ -65,7 +65,7 @@
</term>
<listitem>
<para>The branch in the Git repository the upstream sources are put
- onto. Default is <replaceable>upstream</replaceable></para>
+ onto. Default is <replaceable>upstream</replaceable>.</para>
</listitem>
</varlistentry>
<varlistentry>
@@ -82,7 +82,21 @@
<term><option>--verbose</option>, <option>-v</option>
</term>
<listitem>
- <para>Verbose execution.</para>
+ <para>verbose execution</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--sign-tags</option>
+ </term>
+ <listitem>
+ <para>GPG sign all created tags</para>
+ </listitem>
+ </varlistentry>
+ <varlistentry>
+ <term><option>--keyid=</option><replaceable>gpg-keyid</replaceable>
+ </term>
+ <listitem>
+ <para>use this keyid for gpg signing tags</para>
</listitem>
</varlistentry>
</variablelist>