On Fri, Jan 01, 2016 at 11:00:20AM +0100, Martin Uecker wrote: > > > dh_clean > > dpkg-source -i.git -I.git -b bart-0.2.09d > > dpkg-source: info: using options from bart-0.2.09d/debian/source/options: > > --extend-diff-ignore=(^|/)(version.(inc|txt)|commands.txt)$ > > dpkg-source: info: using source format '3.0 (quilt)' > > dpkg-source: info: building bart using existing ./bart_0.2.09d.orig.tar.gz > > dpkg-source: info: local changes detected, the modified files are: > > bart-0.2.09d/version.txt > > dpkg-source: error: aborting due to unexpected upstream changes, see > > /tmp/bart_0.2.09d-1.diff.anXVz0 > > dpkg-source: info: you can integrate the local changes with dpkg-source > > --commit > > dpkg-buildpackage: error: dpkg-source -i.git -I.git -b bart-0.2.09d gave > > error exit status 2 > > > > > > which is caused by the following diff: > > > > --- bart-0.2.09d.orig/version.txt > > +++ bart-0.2.09d/version.txt > > @@ -1 +1 @@ > > -v0.2.09 > > +v0.2.09d > > > > I don't understand why. Shouldn't the '--extend-diff-ignore' option prevent > this? > For me it works without errors using
I admit I was not aware about this option. > dpkg-buildpackage > > and als using > > gbp buildpackage --git-pbuilder Strange - I cloned from scratch and no success. The only thing I could imaginge might be in ~/.gbp.conf: $ cat ~/.gbp.conf [DEFAULT] builder = ~/bin/git-pbuilder # Might lead to problems because it tries to use non-patched makefiles # cleaner = fakeroot debian/rules clean cleaner = /bin/true pristine-tar = True export=WC [buildpackage] # use this for more svn-buildpackage like behaviour: export-dir = ../build-area/ tarball-dir = ../tarballs/ Any idea whether some option is wrong here. > Happy new year! Same to you and the readers of the list Andreas. -- http://fam-tille.de