[git-buildpackage] Quilt patches get applied twice during gbp buildpackage

[Markus Blatt]

Hi,

I have playing around with git-buildpackage for a few days (Debian
stable). I am using the "3.0 (quilt)" source format (switched from
1.0) and like to quilt patches with a patch-queue branch. I can
sucessfully build the packge on the patch-queue. But when I use the
debian branch with the quilt patches they seem to get applied twice.
This fails miserably.

The output of "gbp buildpackage --git-pristine-tar \
--git-pristine-tar-commit -uc --git-verbose \
--git-debian-branch=debian/sid"
is attached.

Any ideas what goes wrong or how I could prevent one application of
the quilt packages would be highly appreciated.

Cheers,

Markus
-------------- next part --------------
gbp:debug: ['git', 'rev-parse', '--show-cdup']
gbp:debug: ['git', 'rev-parse', '--is-bare-repository']
gbp:debug: /bin/true [] []
gbp:debug: ['git', 'status', '--porcelain']
gbp:debug: ['git', 'symbolic-ref', 'HEAD']
gbp:debug: ['git', 'show-ref', 'refs/heads/debian/sid']
gbp:debug: ['git', 'show-ref', 'refs/heads/pristine-tar']
gbp:debug: ['git', 'log', '--pretty=format:%H', '--grep=pristine-tar .* ert.ecl_2016.10\\.orig.tar\\.', 'pristine-tar', '--']
gbp:debug: Found pristine-tar commit at '04f62e57b4e73819c88217abfbdc5d57daa87b5f'
gbp:debug: ['git', 'rev-parse', '--quiet', '--verify', '04f62e57b4e73819c88217abfbdc5d57daa87b5f^0']
gbp:debug: ['git', 'show', '--pretty=format:%an%x00%ae%x00%ad%x00%cn%x00%ce%x00%cd%x00%s%x00%f%x00%b%x00', '-z', '--date=raw', '--no-renames', '--name-status', '04f62e57b4e73819c88217abfbdc5d57daa87b5f']
gbp:debug: Determined compression type 'gzip'
gbp:debug: debuild -i -I ['-uc'] []
 dpkg-buildpackage -rfakeroot -D -us -uc -i -I
dpkg-buildpackage: source package ert.ecl
dpkg-buildpackage: source version 2016.10-2~1.gbp35d570
dpkg-buildpackage: source distribution UNRELEASED
dpkg-buildpackage: source changed by Markus Blatt <markus at dr-blatt.de>
 dpkg-source -i -I --before-build ert
dpkg-buildpackage: host architecture amd64
dpkg-source: info: applying 0001-Added-dependency-on-python-support.patch
dpkg-source: info: applying 0002-Do-not-build-python-package.patch
dpkg-source: info: applying 0003-Get-rid-off-lintian-warning-description-synopsis-sta.patch
dpkg-source: info: applying 0004-Use-flags-recommended-by-dpkg-buildflags-for-buildin.patch
dpkg-source: info: applying 0005-Allow-for-user-provided-CMAKE_C_FLAGS-on-linux.patch
dpkg-source: info: applying 0006-Use-3.9.6-standard.patch
dpkg-source: info: applying 0007-Prevent-lintian-s-hardening-no-relro-for-summary-bin.patch
dpkg-source: info: applying 0008-libert.ecl-dev-need-to-depend-on-misc-Depends.patch
dpkg-source: info: applying 0009-Added-manpage-for-ecl_summary-as-requested-by-Debian.patch
dpkg-source: info: applying 0010-Install-new-manpage-of-ecl_summary.patch
 fakeroot debian/rules clean
dh clean
   dh_testdir
   dh_auto_clean
   dh_clean
 dpkg-source -i -I -b ert
dpkg-source: info: using source format `3.0 (quilt)'
dpkg-source: info: building ert.ecl using existing ./ert.ecl_2016.10.orig.tar.gz
patching file debian/control
Hunk #1 FAILED at 28.
Hunk #2 FAILED at 36.
2 out of 2 hunks FAILED
dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch '0001-Added-dependency-on-python-support.patch' is correctly applied by quilt, use 'quilt refresh' to update it
dpkg-source: error: LC_ALL=C patch -t -F 0 -N -p1 -u -V never -g0 -E -b -B .pc/0001-Added-dependency-on-python-support.patch/ --reject-file=- < ert.orig.c3GDsD/debian/patches/0001-Added-dependency-on-python-support.patch gave error exit status 1
dpkg-buildpackage: error: dpkg-source -i -I -b ert gave error exit status 2
debuild: fatal error at line 1376:
dpkg-buildpackage -rfakeroot -D -us -uc -i -I failed
gbp:error: 'debuild -i -I -uc' failed: it exited with 25