Package: git-buildpackage
Version: 0.5.11
Severity: normal
Tags: patch
dpkg-source now already ignore .git* so there is no need for configuring
diffignore and tarignore in git-pbuilder. Besides, the actual tarignore
and diffignore in dpkg-source ignore more things (e.g.
debian/source/local-options) than the overriding ignores from git-pbuilder.
At least, if these ignores should stay, git-pbuilder should use
--extend-diff-ignore instead of -i to not override the ignore in dpkg-source.
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (990, 'unstable'), (500, 'testing'), (500, 'stable'), (1,
'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/4 CPU cores)
Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Versions of packages git-buildpackage depends on:
ii devscripts 2.10.69 scripts to make the life of a Debi
ii git [git-core] 1:1.7.2.3-2.1 fast, scalable, distributed revisi
ii git-core 1:1.7.2.3-2.1 fast, scalable, distributed revisi
ii python 2.6.6-3+squeeze2 interactive high-level object-orie
ii python-dateutil 1.4.1-3 powerful extensions to the standar
ii python-support 1.0.11 automated rebuilding support for P
Versions of packages git-buildpackage recommends:
ii cowbuilder 0.62+nmu2 pbuilder running on cowdancer
ii pristine-tar 1.11 regenerate pristine tarballs
Versions of packages git-buildpackage suggests:
pn git-load-dirs <none> (no description available)
-- no debconf information
diff -Naurp git-buildpackage-0.5.11/git-pbuilder git-buildpackage-0.5.11.new/git-pbuilder
--- git-buildpackage-0.5.11/git-pbuilder 2010-10-07 12:50:37.000000000 +0200
+++ git-buildpackage-0.5.11.new/git-pbuilder 2010-12-09 00:04:44.684201688 +0100
@@ -98,10 +98,9 @@ update|create|login)
;;
esac
-# Now we can finally run pdebuild. The quoting here is tricky, but this
-# seems to pass everything through properly.
+# Now we can finally run pdebuild.
pdebuild --buildresult .. --pbuilder cowbuilder \
- --debbuildopts "-i'(?:^|/)\\.git(attributes)?(?:\$|/.*\$)' -I.git $*" \
+ --debbuildopts "$*" \
-- --basepath "$BASE" $OPTIONS
if [ -n "`ls ../*_source.changes`" ] ; then
rm ../*_source.changes
diff -Naurp git-buildpackage-0.5.11/git-pbuilder git-buildpackage-0.5.11.new/git-pbuilder
--- git-buildpackage-0.5.11/git-pbuilder 2010-10-07 12:50:37.000000000 +0200
+++ git-buildpackage-0.5.11.new/git-pbuilder 2010-12-09 00:23:56.312451693 +0100
@@ -101,7 +101,7 @@ esac
# Now we can finally run pdebuild. The quoting here is tricky, but this
# seems to pass everything through properly.
pdebuild --buildresult .. --pbuilder cowbuilder \
- --debbuildopts "-i'(?:^|/)\\.git(attributes)?(?:\$|/.*\$)' -I.git $*" \
+ --debbuildopts "--extend-diff-ignore='(?:^|/)\\.git(attributes)?(?:\$|/.*\$)' -I.git $*" \
-- --basepath "$BASE" $OPTIONS
if [ -n "`ls ../*_source.changes`" ] ; then
rm ../*_source.changes
