Package: dgit Version: 9.11 I've been working on converting the pam source package to properly use 3.0 (quilt) format where patches are in debian/patches, instead of the legacy system that uses a different directory for patches and applies them at build time with quilt.
Unfortunatley, dgit is throwing errors at me about quilt serialization. I initially tried to move the entire patch series to debian/patches in one go and hit the error; then since it talked about "serialization" I tried moving them one at a time, but hit the same error again on the 4th patch. $ dgit build Format `3.0 (quilt)', need to check/update patch stack dpkg-buildpackage: info: source package pam dpkg-buildpackage: info: source version 1.4.0-1 dpkg-buildpackage: info: source distribution UNRELEASED dpkg-buildpackage: info: source changed by Steve Langasek <vor...@debian.org> fakeroot debian/rules clean dh clean --with quilt,autoreconf dh: warning: Compatibility levels before 10 are deprecated (level 9 in use) dh_quilt_unpatch Removing patch 007_modules_pam_unix Removing modules/pam_unix/obscure.c Restoring modules/pam_unix/pam_unix.8.xml Restoring modules/pam_unix/Makefile.am Restoring modules/pam_unix/pam_unix.8 Restoring modules/pam_unix/support.h Restoring modules/pam_unix/README Restoring modules/pam_unix/pam_unix_passwd.c Removing patch make_documentation_reproducible.patch Restoring configure.ac Removing patch pam_unix_dont_trust_chkpwd_caller.patch Restoring modules/pam_unix/unix_chkpwd.c Removing patch pam_unix_fix_sgid_shadow_auth.patch Restoring modules/pam_unix/passverify.c No patches applied dh_clean dh_clean: warning: Compatibility levels before 10 are deprecated (level 9 in use) examining quilt state (multiple patches, linear mode) gzip: warning: GZIP environment variable is deprecated; use an alias or script Tree already contains .pc - will use it then delete it. dgit: base trees orig=058b0c4bd5049b9214d5 o+d/p=da5e6a7de7ec5d1c7619 dgit: quilt differences: src: ## orig ## gitignores: == orig == dgit: quilt differences: HEAD ## o+d/p HEAD == o+d/p starting quiltify (multiple patches, linear mode) dgit: error: quilt fixup cannot be linear. Stopped at: dgit: 6f4c661d..e8d14c81: changed .pc/007_modules_pam_unix/.timestamp,.pc/007_modules_pam_unix/modules/pam_unix/Makefile.am,.pc/007_modules_pam_unix/modules/pam_unix/README,.pc/007_modules_pam_unix/modules/pam_unix/obscure.c,.pc/007_modules_pam_unix/modules/pam_unix/pam_unix.8,.pc/007_modules_pam_unix/modules/pam_unix/pam_unix.8.xml,.pc/007_modules_pam_unix/modules/pam_unix/pam_unix_passwd.c,.pc/007_modules_pam_unix/modules/pam_unix/support.h,.pc/applied-patches,debian/patches/007_modules_pam_unix,debian/patches/series dgit: Maybe you need one of --[quilt=]gbp --[quilt=]dpm --quilt=unapplied ? dgit: Maybe orig tarball(s) are not identical to git representation? dgit: error: quilt history linearisation failed. Search `quilt fixup' in dgit(7). $ It's not an unapplied tree; I probably would've preferred that, but --quilt=unapplied was useless here and I only started to make any progress at all when I applied the patches to the tree and committed. I've pushed the branch to https://salsa.debian.org/vorlon/pam/-/tree/dgit-quilt-breakage for inspection if that helps. -- Steve Langasek Give me a lever long enough and a Free OS Debian Developer to set it on, and I can move the world. Ubuntu Developer https://www.debian.org/ slanga...@ubuntu.com vor...@debian.org
signature.asc
Description: PGP signature
