.gitattributes -------------- Starting with version 1:6.0-1, the upstream tarball contains at least one file (docs/make.bat) with CRLF line endings. Although a .gitattributes file is included to make git check out the file(s) with CRLF line endings, the default behaviour of git-buildpackage is to override the .gitattributes file and check everything out with LF line endings. This causes the file in the working tree to differ from the one in the tarball, causing the build to fail and hindering any operations that rely on pristine-tar. To mitigate this issue, the following changes have been made: * debian/gbp.conf - The "defuse-gitattributes = off" option has been specified to make git-buildpackage respect the .gitattributes file when performing git operations. * debian/salsa-ci.yml - The "SALSA_CI_DISABLE_GBP_SETUP_GITATTRIBUTES" variable has been set to prevent the Salsa CI pipeline from running "gbp setup-gitattributes" which would also cause the included .gitattributes file to be ignored. -- Dale Richards Thu, 04 Jan 2024 16:44:29 +0000