Change the default of cleaner to /bin/true

Running a clean command within version control by default nowadays
causes more trouble than it helps. It's unnecessary with
pbuilder/cowbuilder/sbuild and with export-dir. So change the default
from 'debuild clean' to a noop ('/bin/true').

Closes: #670624

diff --git a/debian/NEWS b/debian/NEWS
index 57c4740581572340ca65733028b2aa9d782a1d5b..69ed3d9df3212f1ab9954f1daea1647f3c9ebf3e 100644 (file)
--- a/debian/NEWS
+++ b/debian/NEWS
@@ -1,3 +1,11 @@
+git-buildpackage (0.6.9~) UNRELEASED; urgency=medium
+
+  This version changes the default of the cleaner options from 'debuild clean'
+  to a noop ('/bin/true'). If you want to retain the old behaviour you can still
+  configure it via gbp.conf. For more details see #670624.
+
+ -- Guido Günther <agx@sigxcpu.org>  Sun, 05 Jan 2014 15:52:39 +0100
+
 git-buildpackage (0.6.0) unstable; urgency=low
 
   In order to provide a more consistent and git like interface a new gbp super

diff --git a/gbp/config.py b/gbp/config.py
index f17d57f4c733189e5d07230d1908bda9f80fbabe..e465cede88d14c7ad20b3939e6e626b74d28a3b0 100644 (file)
--- a/gbp/config.py
+++ b/gbp/config.py
@@ -470,7 +470,7 @@ class GbpOptionParserDebian(GbpOptionParser):
     defaults = dict(GbpOptionParser.defaults)
     defaults.update( {
                        'builder'            : 'debuild -i -I',
-                       'cleaner'            : 'debuild -d clean',
+                       'cleaner'            : '/bin/true',
                      } )
 
 # vim:et:ts=4:sw=4:et:sts=4:ai:set list listchars=tab\:»·,trail\:·: