Comment 1 for bug 1806630

Revision history for this message
Frank Heimes (fheimes) wrote :

Hmm, I'm facing a similar issue if calling 'dpkg-buildpackage -S -d' (that calls again 'dpkg-source') and having a quilt patch in place that modifies debian/* content (i.e. debian/tests/control).

While we commonly use quilt to modify also content below debian/*
reading the following in the Debian/Ubuntu policy:
The program quilt offers a basic method for recording modifications to the upstream source for Debian packaging.
(https://www.debian.org/doc/manuals/maint-guide/modify.en.html)
makes me think.
Not sure if quilt is really limited for patching source code only (and no meta data, like debian/*) ?

The quilt patch I have 'pushes' and 'pops' totally fine, using quilt directly.
But just not if called by 'dpkg-buildpackage -S -d' (aka 'dpkg-source'):

$ dpkg-buildpackage -S -d
dpkg-buildpackage: info: source package plf-colony
dpkg-buildpackage: info: source version 6.12-1ubuntu1
dpkg-buildpackage: info: source distribution hirsute
dpkg-buildpackage: info: source changed by Frank Heimes <email address hidden>
 dpkg-source --before-build .
dpkg-source: info: using patch list from debian/patches/series
dpkg-source: info: applying lp-1916749-ignore-dis_syslink-messages-on-ppc64el-with-glibc-2.33.patch
 debian/rules clean
dh clean
   dh_clean
 dpkg-source -b .
dpkg-source: info: using source format '3.0 (quilt)'
dpkg-source: info: building plf-colony using existing ./plf-colony_6.12.orig.tar.xz
dpkg-source: info: using patch list from debian/patches/series
patching file debian/tests/control
Reversed (or previously applied) patch detected! Skipping patch.
1 out of 1 hunk ignored
dpkg-source: info: the patch has fuzz which is not allowed, or is malformed
dpkg-source: info: if patch 'lp-1916749-ignore-dis_syslink-messages-on-ppc64el-with-glibc-2.33.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 -E -b -B .pc/lp-1916749-ignore-dis_syslink-messages-on-ppc64el-with-glibc-2.33.patch/ --reject-file=- < plf-colony.orig.h2y_qd/debian/patches/lp-1916749-ignore-dis_syslink-messages-on-ppc64el-with-glibc-2.33.patch subprocess returned exit status 1
dpkg-buildpackage: error: dpkg-source -b . subprocess returned exit status 2

And there is also no reject file.