don't hardcode -i\.git -I.git as build arguments

7 files changed, 26 insertions, 9 deletions

diff --git a/debian/NEWS b/debian/NEWS
index 7eeace09..e98be909 100644
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,18 @@
+git-buildpackage (0.3.3) unstable; urgency=low
+
+  As of this version git-buildpackage doesn't pass hardcoded '-i\.git -I.git'
+  to the build command specified via --git-builder (or via the builder config
+  file options). So if you're not using the default build command (which is
+  now 'debuild -i\.git -I.git' instead of just plain 'debuild') you'll have to
+  add these options to your build command in order to exclude git metadata
+  from your diffs and source tarballs.
+  This was done to make the invocation of the build command more flexible, we
+  don't rely on debuild behaviour from now on.
+  Again: if you didn't change the default build command, you don't have to
+  change anything.
+
+ -- Guido Guenther <agx@sigxcpu.org>  Mon, 20 Aug 2007 18:08:37 +0200
+
 git-buildpackage (0.2.25) unstable; urgency=low
 
   Generated tags are now by default put into debian/ and upstream/ namespaces.
diff --git a/docs/chapters/cfgfile.sgml b/docs/chapters/cfgfile.sgml
index 26dc5230..92722133 100644
--- a/docs/chapters/cfgfile.sgml
+++ b/docs/chapters/cfgfile.sgml
@@ -49,7 +49,7 @@
 <screen>
 [DEFAULT]
 # the default build command
-builder=debuild
+builder=debuild -i\.git -I.git
 # the default branch for upstream sources
 upstream-branch=upstream
 # the default branch for the debian patch
diff --git a/docs/chapters/special.sgml b/docs/chapters/special.sgml
index 9fa78747..b7982be2 100644
--- a/docs/chapters/special.sgml
+++ b/docs/chapters/special.sgml
@@ -75,7 +75,7 @@ cleanup-script.sh
 cat &lt;&lt;EOF &gt;/usr/local/bin/git-pbuilder
 #!/bin/sh
 # pass all options to dpkg-buildpackage:
-pdebuild --debbuildopts "$*"
+pdebuild --debbuildopts "-i\.git -I.git $*"
 EOF
 chmod a+x /usr/local/bin/git-pbuilder
 </programlisting>
diff --git a/docs/manpages/git-buildpackage.sgml b/docs/manpages/git-buildpackage.sgml
index ae8eadf4..87d5a4f3 100644
--- a/docs/manpages/git-buildpackage.sgml
+++ b/docs/manpages/git-buildpackage.sgml
@@ -83,7 +83,7 @@
       <varlistentry>
         <term><option>--git-builder=<replaceable>BUILD_CMD</replaceable></option></term>
         <listitem>
-          <para>Use <replaceable>BUILD_CMD</replaceable> instead of <command>debuild</command></para>
+          <para>Use <replaceable>BUILD_CMD</replaceable> instead of <command>debuild -i\.git -I.git</command></para>
         </listitem>
       </varlistentry>
       <varlistentry>
diff --git a/gbp.conf b/gbp.conf
index c4d0774b..0082c844 100644
--- a/gbp.conf
+++ b/gbp.conf
@@ -2,7 +2,9 @@
 
 [DEFAULT]
 # the default build command:
-#builder = debuild
+#builder = debuild -i\.git/ -I.git
+# the default clean command:
+#cleaner = debuild clean
 # the default branch for upstream sources:
 #upstream-branch = upstream
 # the default branch for the debian patch:
diff --git a/gbp/config.py b/gbp/config.py
index bc19dcd9..7f030fe7 100644
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -22,12 +22,12 @@ class GbpOptionParser(OptionParser):
     @cvar config_files: list of config files we parse
     @type config_files: list
     """
-    defaults={ 'builder'         : 'debuild',
-               'cleaner'	     : 'debuild clean',
+    defaults={ 'builder'         : 'debuild -i\.git/ -I.git',
+               'cleaner'         : 'debuild clean',
                'debian-branch'   : 'master',
                'upstream-branch' : 'upstream',
-               'sign-tags'	     : '',		# empty means False
-               'keyid'		     : '',
+               'sign-tags'       : '',		# empty means False
+               'keyid'           : '',
                'posttag'         : '',
                'debian-tag'      : 'debian/%(version)s',
                'upstream-tag'    : 'upstream/%(version)s',
diff --git a/git-buildpackage b/git-buildpackage
index 6817a820..17b541c9 100755
--- a/git-buildpackage
+++ b/git-buildpackage
@@ -116,7 +116,7 @@ def main(argv):
             if not create_orig(cp, output_dir, options.upstream_branch):
                 raise GbpError
 
-        Command(options.build_cmd, [ '-i\.git/', '-I.git' ] + dpkg_args, shell=True)()
+        Command(options.build_cmd, dpkg_args, shell=True)()
         if options.tag:
             try:
                 version = cp['Version']