Package: git-buildpackage
Version: 0.6.31
Followup-For: Bug #787519
Dear Maintainer,
Here is second patch to update the documentation.
Regards,
Rodolphe
-- System Information:
Debian Release: stretch/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.0.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.utf8, LC_CTYPE=fr_FR.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
Versions of packages git-buildpackage depends on:
ii devscripts 2.15.4
ii git 1:2.1.4-2.1
ii man-db 2.7.0.2-5
ii python 2.7.9-1
ii python-dateutil 2.2-2
ii python-pkg-resources 17.0-1
ii python-six 1.9.0-3
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.73
ii pristine-tar 1.33
ii python-requests 2.7.0-2
Versions of packages git-buildpackage suggests:
pn python-notify <none>
ii unzip 6.0-17
-- no debconf information
>From 52a9432d42cf8fe433a11c231276e7813b080647 Mon Sep 17 00:00:00 2001
From: Rodolphe PELLOUX-PRAYER <rodol...@damsy.net>
Date: Fri, 5 Jun 2015 15:29:19 +0200
Subject: [PATCH] Update docs to point out the new config file.
---
bin/git-pbuilder | 11 ++++++-----
docs/chapters/cfgfile.sgml | 2 +-
docs/chapters/special.sgml | 3 ++-
docs/manpages/gbp.conf.sgml | 2 +-
4 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/bin/git-pbuilder b/bin/git-pbuilder
index 3f0930d..5c7e8b5 100644
--- a/bin/git-pbuilder
+++ b/bin/git-pbuilder
@@ -379,11 +379,12 @@ B<git-buildpackage> to use it, add a stanza like:
[DEFAULT]
builder = /path/to/git-pbuilder
-in your F<gbp.conf> file (which can be F<.gbp.conf> in your home directory
-or at the top level of the repository, or F<gbp.conf> in the F<.git>
-directory). DIST and ARCH are read as an environment variable so that you
-can set it before running B<git-buildpackage> without having to worry
-about passing parameters through B<git-buildpackage>.
+in your F<gbp.conf> file (which can be F<$XDG_CONFIG_HOME/debian/gbp.conf> or
+F<.gbp.conf> in your home directory, or F<.gbp.conf> at the top level of the
+repository, or F<gbp.conf> in the F<.git> directory). DIST and ARCH are read
+as an environment variable so that you can set it before running
+B<git-buildpackage> without having to worry about passing parameters through
+B<git-buildpackage>.
Alternately, B<git-pbuilder> may be called with an argument of C<update>,
C<create>, or C<login>. In this case, it calls B<cowbuilder> (or the
diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.sgml
index 43d5430..3b600c5 100644
--- a/docs/chapters/cfgfile.sgml
+++ b/docs/chapters/cfgfile.sgml
@@ -7,7 +7,7 @@
<listitem><para>system wide configuraton</para></listitem>
</varlistentry>
<varlistentry>
- <term>~/.gbp.conf</term>
+ <term>$XDG_CONFIG_DIR/debian/gbp.conf or ~/.gbp.conf</term>
<listitem><para>per user configuration</para></listitem>
</varlistentry>
<varlistentry>
diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml
index 7776330..0c0984f 100644
--- a/docs/chapters/special.sgml
+++ b/docs/chapters/special.sgml
@@ -80,7 +80,8 @@ cleanup-script.sh
<option>clean</option> means something different than &debuildcmd;
<option>clean</option>.
- We can shorten this further by using <filename>~/.gbp.conf</filename>:
+ We can shorten this further by using <filename>$XDG_CONFIG_HOME/debian/gbp.conf<filename>
+ or <filename>~/.gbp.conf</filename>:
<programlisting>
cat <<EOF > <filename>~/.gbp.conf</filename>
diff --git a/docs/manpages/gbp.conf.sgml b/docs/manpages/gbp.conf.sgml
index b48d9e1..a97cf2d 100644
--- a/docs/manpages/gbp.conf.sgml
+++ b/docs/manpages/gbp.conf.sgml
@@ -23,7 +23,7 @@
<listitem><para>system wide</para></listitem>
</varlistentry>
<varlistentry>
- <term>~/.gbp.conf</term>
+ <term>$XDG_CONFIG_HOME/debian/gbp.conf or ~/.gbp.conf</term>
<listitem><para>per user</para></listitem>
</varlistentry>
<varlistentry>
--
libgit2 0.22.2
