diff options
| author | Guido Günther <agx@sigxcpu.org> | 2009-11-22 17:04:42 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2009-11-22 17:12:19 +0100 |
| commit | 06059dfc4972ed641a669a817146af6d49253e48 (patch) | |
| tree | 38bdfa2942f4dbda69252cd9c21da9d905d3c012 | |
| parent | c5e41484150403547a1d0db8151b3a0d5bf6b80b (diff) | |
Make the default build command 3.x source format safe
Instead of passing "-i\.git/ -I.git" to debuild use "-i -I". This makes
sure we use the default behaviour of dpkg-source.
Closes: #553079
| -rw-r--r-- | debian/NEWS | 9 | ||||
| -rwxr-xr-x | examples/gbp-cowbuilder-sid | 2 | ||||
| -rwxr-xr-x | examples/gbp-pbuilder | 2 | ||||
| -rw-r--r-- | gbp.conf | 2 | ||||
| -rw-r--r-- | gbp/config.py | 2 |
5 files changed, 13 insertions, 4 deletions
diff --git a/debian/NEWS b/debian/NEWS index 9a5861de..e5b69910 100644 --- a/debian/NEWS +++ b/debian/NEWS @@ -1,3 +1,12 @@ +git-buildpackage (0.4.61) unstable; urgency=low + + In order to not override dpkg-buildpackge's defaults for 3.0 source packages + the default builder command is now "debuild -i -I" instead of "debuild + -i\.git/ -I.git". If you want to retain the old behaviour please adjust your + gbp.conf accordingly. + + -- Guido Günther <agx@sigxcpu.org> Sun, 22 Nov 2009 17:07:52 +0100 + git-buildpackage (0.4.57) unstable; urgency=low git-import-orig dosn't generate changelog entries by default anymore. This diff --git a/examples/gbp-cowbuilder-sid b/examples/gbp-cowbuilder-sid index 4021f23c..02d51a14 100755 --- a/examples/gbp-cowbuilder-sid +++ b/examples/gbp-cowbuilder-sid @@ -31,7 +31,7 @@ case $ACTION in pdebuild --configfile ${CONF} \ --pbuilder cowbuilder \ --buildresult ${GBP_BUILD_DIR}/.. \ - --debbuildopts "-i\.git/ -I.git $*" \ + --debbuildopts "-i -I $*" \ -- $OPTS ;; esac diff --git a/examples/gbp-pbuilder b/examples/gbp-pbuilder index bb1798e9..ad36237b 100755 --- a/examples/gbp-pbuilder +++ b/examples/gbp-pbuilder @@ -5,5 +5,5 @@ set -e # pass all options to dpkg-buildpackage: -pdebuild $PBUILDER_OPTS --debbuildopts "-i\.git/ -I.git $*" +pdebuild $PBUILDER_OPTS --debbuildopts "-i -I $*" @@ -2,7 +2,7 @@ [DEFAULT] # the default build command: -#builder = debuild -i\.git/ -I.git +#builder = debuild -i -I # the default clean command: #cleaner = debuild clean # the default branch for upstream sources: diff --git a/gbp/config.py b/gbp/config.py index f670ad5e..8df9d353 100644 --- a/gbp/config.py +++ b/gbp/config.py @@ -25,7 +25,7 @@ class GbpOptionParser(OptionParser): @cvar config_files: list of config files we parse @type config_files: list """ - defaults = { 'builder' : 'debuild -i\.git/ -I.git', + defaults = { 'builder' : 'debuild -i -I', 'cleaner' : 'debuild -d clean', 'debian-branch' : 'master', 'upstream-branch' : 'upstream', |