allow for another config file $REPO/debian/gbp.conf

the advantage over $REPO/.gbp.conf is that one can keep everything
packaging related below debian/. Thanks to Sean Finney.

Closes: #502253

diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.sgml
index 6aa2f10db7463966274e527c80fe05eda39f0b93..3590a1758c61d0d4fca3184643d8fb37aa98fea5 100644 (file)
--- a/docs/chapters/cfgfile.sgml
+++ b/docs/chapters/cfgfile.sgml
@@ -15,6 +15,10 @@
       <listitem><para>per repository/branch configuration</para></listitem> 
       </varlistentry> 
       <varlistentry>
+      <term>debian/gbp.conf</term>
+      <listitem><para>per repository/branch configuration</para></listitem> 
+      </varlistentry> 
+      <varlistentry>
       <term>.git/gbp.conf</term>
       <listitem><para>per (local) repository configuration</para></listitem> 
       </varlistentry> 

diff --git a/docs/manpages/man.conffiles.sgml b/docs/manpages/man.conffiles.sgml
index 29bff99eb80c74da3737d93807e1b3d9caf36f8d..c94253d8f9dc7c904e70ce4f4281f59a46b94009 100644 (file)
--- a/docs/manpages/man.conffiles.sgml
+++ b/docs/manpages/man.conffiles.sgml
@@ -16,6 +16,11 @@
       repository</para></listitem> 
       </varlistentry> 
       <varlistentry>
+      <term>debian/gbp.conf</term>
+      <listitem><para>per branch configuration, can be published with the
+      repository</para></listitem> 
+      </varlistentry>
+      <varlistentry>
       <term>.git/gbp.conf</term>
       <listitem><para>per repository configuration</para></listitem> 
       </varlistentry> 

diff --git a/gbp/config.py b/gbp/config.py
index c915c99cebb1c56b40b70a4e275fffed859d005e..2235f3456275f741bda0ebc7e13dda511e6366dd 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -48,6 +48,7 @@ class GbpOptionParser(OptionParser):
     config_files = [ '/etc/git-buildpackage/gbp.conf',
                      os.path.expanduser('~/.gbp.conf'),
                      '.gbp.conf',
+                     'debian/gbp.conf',
                      '.git/gbp.conf' ]
 
     def __parse_config_files(self):