Package: dpkg Version: 1.19.7 Severity: normal Hello,
when trying to build the new upstream version of Widelands with git- buildpackage, I had an error message saying that some files were modified out of the debian/ directory. It turns out that the difference is only about the line endings: some files of the upstream tarball are encoded with CRLF while most of them are LF only. When importing the files in the upstream branch of my git, the CRLF are automatically converted to LF by git, but when dpkg-source compares the content of the current dir (ie, the checkout) with the content of the tarball, it fails with a rather uninformative error message: dpkg-source: info: local changes detected, the modified files are: widelands-21/cmake/Modules/FindSDL2_image.cmake widelands-21/cmake/Modules/FindSDL2_mixer.cmake widelands-21/cmake/Modules/FindSDL2_ttf.cmake widelands-21/data/maps/Twin_Lagoons_v2.wmf/elemental widelands-21/src/third_party/eris/README.eris dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/widelands_21-1.diff.YyKJqP My first glance at the diff was not enough to understand the pb, stupid me. Instead it took me several hours to understand the issue. I repacked and reimported my upstream tarball quite a few times before that. Then, I had to manually repack the upstream archive after dos2unix'ing the relevant files to fix it. I think that it'd be really better if dpkg-source would ignore those difference in the first place. I'm not completely sure, but I think that this is what the --strip-trailing-cr option of diff is meant for. Thanks for the fish, Mt -- Package-specific info: System tainted due to merged-usr-via-symlinks. -- System Information: Debian Release: bullseye/sid APT prefers testing APT policy: (500, 'testing') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.7.0-1-amd64 (SMP w/12 CPU threads) Kernel taint flags: TAINT_USER, TAINT_WARN Locale: LANG=fr_FR.UTF-8, LC_CTYPE=fr_FR.UTF-8 (charmap=UTF-8), LANGUAGE not set Shell: /bin/sh linked to /usr/bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages dpkg depends on: ii libbz2-1.0 1.0.8-3 ii libc6 2.31-1 ii liblzma5 5.2.4-1+b1 ii libselinux1 3.0-1+b3 ii tar 1.30+dfsg-7 ii zlib1g 1:1.2.11.dfsg-2 dpkg recommends no packages. Versions of packages dpkg suggests: ii apt 2.1.7 pn debsig-verify <none> -- no debconf information -- A theory is something nobody believes, except the person who made it. An experiment is something everybody believes, except the person who made it.
signature.asc
Description: PGP signature
