Package: devscripts Version: 2.20.2 Severity: normal File: /usr/bin/uscan Dear Maintainer,
I have this issue in opencascade, with Files-Excluded in d/copyright and long filenames that those long filnames are ending up shown e.g. in mc' tarball browser as as "<somehash>.data" in the root directory. After importing the orig.tar with gbp, a debuild complained about changes on those files. Strangely, the diff did look like a shell script and not like a header. Additionally, it cannot find one file listed in Files-Excluded, but it is one named in the tarball (it was choking on upgrade.bat) Two examples of the long filenames: src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.cxx src/StepVisual/srcStepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx I've now manually repackaged the tarball and imported it using gpb; this time debuild did not complain, so I guess something in uscan is phishy.... Reproducer: debcheckout opencascade cd opencascade git checkout debian/7.4.0+dfsg1-1 uscan # will error out. to continue, remove upgrade.bat from d/copyrights Files-Excluded: # tar: occt-V7_4_0p1/upgrade.bat: not found in archive # However, checking the archive: # tar --list -f opencascade_7.4.0p1.orig.tar.gz | grep upgrade.bat # occt-V7_4_0p1/upgrade.bat # After upgrade.bat has been removed from d/copyright: gbp import-orig --upstream-version 7.4.1+dfsg1 ../opencascade_7.4.0p1+dfsg1.orig.tar.xz --no-sign-tags dch --newversion 7.4.1+dfsg1-1 "New upstream version." debuild -d yields to: dpkg-source: info: building opencascade using existing ./opencascade_7.4.1+dfsg1.orig.tar.xz dpkg-source: info: using patch list from debian/patches/series dpkg-source: info: local changes detected, the modified files are: opencascade/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx dpkg-source: error: aborting due to unexpected upstream changes, see /tmp/opencascade_7.4.1+dfsg1-1.diff.uyiYOP dpkg-source: info: you can integrate the local changes with dpkg-source --commit dpkg-buildpackage: error: dpkg-source -b . subprocess returned exit status 2 debuild: fatal error at line 1182: The diff file does not at all look like a header file: cat /tmp/opencascade_7.4.1+dfsg1-1.diff.uyiYOP Description: <short summary of the patch> TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. . opencascade (7.4.1+dfsg1-1) UNRELEASED; urgency=medium . * New upstream version. Author: Tobias Frost <t...@debian.org> --- The information above should follow the Patch Tagging Guidelines, please checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here are templates for supplementary fields that you might want to add: Origin: <vendor|upstream|other>, <url of original patch> Bug: <url in upstream bugtracker> Bug-Debian: https://bugs.debian.org/<bugnumber> Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> Forwarded: <no|not-needed|url proving that it has been forwarded> Reviewed-By: <name and email of someone who approved the patch> Last-Update: 2020-04-10 --- opencascade-7.4.1+dfsg1.orig/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx +++ opencascade-7.4.1+dfsg1/src/StepVisual/StepVisual_AnnotationCurveOccurrenceAndAnnotationOccurrenceAndGeomReprItemAndReprItemAndStyledItem.hxx @@ -1,23 +1,23 @@ -@echo off - -rem Helper script to run procedure of automatic upgrade of application code -rem on newer version of OCCT on Windows. -rem Running it requires that Tcl should be in the PATH - -SET "OLD_PATH=%PATH%" - -if exist "%~dp0env.bat" ( - call "%~dp0env.bat" -) - -set "TCL_EXEC=tclsh.exe" - -for %%X in (%TCL_EXEC%) do (set TCL_FOUND=%%~$PATH:X) - -if defined TCL_FOUND ( - %TCL_EXEC% %~dp0adm/start.tcl upgrade %* -) else ( - echo "Error. %TCL_EXEC% is not found. Please update PATH variable" -) - -SET "PATH=%OLD_PATH%" +@echo off + +rem Helper script to run procedure of automatic upgrade of application code +rem on newer version of OCCT on Windows. +rem Running it requires that Tcl should be in the PATH + +SET "OLD_PATH=%PATH%" + +if exist "%~dp0env.bat" ( + call "%~dp0env.bat" +) + +set "TCL_EXEC=tclsh.exe" + +for %%X in (%TCL_EXEC%) do (set TCL_FOUND=%%~$PATH:X) + +if defined TCL_FOUND ( + %TCL_EXEC% %~dp0adm/start.tcl upgrade %* +) else ( + echo "Error. %TCL_EXEC% is not found. Please update PATH variable" +) + +SET "PATH=%OLD_PATH%" I'm not sure what's causing this… As said, I manually repackaged this and gbp import-orig'ed it and then it worked. So I guess there is something in uscan… Let me know if you need more details… -- tobi -- Package-specific info: --- /etc/devscripts.conf --- Empty. --- ~/.devscripts --- DEBSIGN_KEYID=13C904F0CE085E7C36307985DECF849AA6357FB7 DEBUILD_LINTIAN_OPTS="-EvIL +pedantic" DSCVERIFY_KEYRINGS="/usr/share/keyrings/debian-maintainers.gpg:~/.gnupg/pubring.gpg" DEBUILD_PREPEND_PATH="/usr/lib/ccache" DEBUILD_PRESERVE_ENVVARS=CCACHE_DIR -- System Information: Debian Release: bullseye/sid APT prefers unstable APT policy: (500, 'unstable'), (500, 'testing'), (500, 'stable'), (1, 'experimental') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 5.4.0-4-amd64 (SMP w/4 CPU cores) Kernel taint flags: TAINT_PROPRIETARY_MODULE, TAINT_OOT_MODULE, TAINT_UNSIGNED_MODULE Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8), LANGUAGE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) LSM: AppArmor: enabled Versions of packages devscripts depends on: ii dpkg-dev 1.19.7 ii fakeroot 1.24-1 ii file 1:5.38-4 ii gnupg 2.2.20-1 ii gnupg2 2.2.20-1 ii gpgv 2.2.20-1 ii libc6 2.30-4 ii libfile-homedir-perl 1.004-1 ii libfile-which-perl 1.23-1 ii libipc-run-perl 20180523.0-2 ii libmoo-perl 2.003006-1 ii libwww-perl 6.43-1 ii patchutils 0.3.4-2+b1 ii perl 5.30.0-9 ii python3 3.8.2-3 ii sensible-utils 0.0.12+nmu1 ii wdiff 1.2.2-2+b1 Versions of packages devscripts recommends: ii apt 2.0.1 ii at 3.1.23-1+b1 ii curl 7.68.0-1 ii dctrl-tools 2.24-3+b1 ii debian-keyring 2020.03.24 ii dput 1.0.3 ii equivs 2.2.0 ii libdistro-info-perl 0.23 ii libdpkg-perl 1.19.7 ii libencode-locale-perl 1.05-1 ii libgit-wrapper-perl 0.048-1 ii libgitlab-api-v4-perl 0.25-1 ii liblist-compare-perl 0.53-1 ii liblwp-protocol-https-perl 6.07-2 ii libsoap-lite-perl 1.27-1 ii libstring-shellquote-perl 1.04-1 ii libtry-tiny-perl 0.30-1 ii liburi-perl 1.76-2 ii licensecheck 3.0.46-1 ii lintian 2.62.0 ii man-db 2.9.1-1 ii patch 2.7.6-6 ii python3-apt 1.9.10 ii python3-debian 0.1.36 ii python3-magic 2:0.4.15-3 ii python3-requests 2.23.0+dfsg-2 ii python3-unidiff 0.5.5-2 ii python3-xdg 0.26-2 ii strace 5.5-1 ii unzip 6.0-25 ii wget 1.20.3-1+b2 ii xz-utils 5.2.4-1+b1 Versions of packages devscripts suggests: pn adequate <none> ii autopkgtest 5.12.1 pn bls-standalone <none> ii bsd-mailx [mailx] 8.1.2-0.20180807cvs-1+b1 ii build-essential 12.8 pn check-all-the-things <none> pn cvs-buildpackage <none> ii debhelper 12.10 pn devscripts-el <none> ii diffoscope 137 ii disorderfs 0.5.8-2 ii dose-extra 5.0.1-14+b2 pn duck <none> ii faketime 0.9.7-3 ii gnuplot 5.2.8+dfsg1-2 ii gnuplot-qt [gnuplot] 5.2.8+dfsg1-2 pn how-can-i-help <none> ii libauthen-sasl-perl 2.1600-1 pn libdbd-pg-perl <none> ii libfile-desktopentry-perl 0.22-1 pn libnet-smtps-perl <none> pn libterm-size-perl <none> ii libtimedate-perl 2.3200-1 pn libyaml-syck-perl <none> pn mozilla-devscripts <none> ii mutt 1.13.2-1 ii openssh-client [ssh-client] 1:8.2p1-4 pn piuparts <none> pn postgresql-client <none> ii quilt 0.66-1 ii ratt 0.0~git20180127.c44413c-2+b10 ii reprotest 0.7.14 pn svn-buildpackage <none> ii w3m 0.5.3-37+b1 -- no debconf information
