On 12/31/2016 06:55 PM, Martin Landa wrote: > dpkg-source: info: local changes detected, the modified files are: > gdal-grass/VERSION > dpkg-source: error: aborting due to unexpected upstream changes, see > /tmp/libgdal-grass_2.1.0-1~xenial2.diff.2sFEMI > dpkg-source: info: you can integrate the local changes with dpkg-source > --commit > dpkg-buildpackage: error: dpkg-source -b gdal-grass gave error exit status 2 > gbp:error: 'git-pbuilder -S -sa' failed: it exited with 2
The above show that there are changes to the upstream source in your working copy that are not in the upstream source itself. Most likely the new version was not merged correctly. Inspect the file to see whether it matches what is in the upstream branch, e.g.: git diff upstream/2.1.2 VERSION The /tmp/libgdal-grass_2.1.0-1~xenial2.diff.2sFEMI should point that out too. Kind Regards, Bas -- GPG Key ID: 4096R/6750F10AE88D4AF1 Fingerprint: 8182 DE41 7056 408D 6146 50D1 6750 F10A E88D 4AF1
