Package: devscripts Version: 2.15.8 Followup-For: Bug #796986 Hi,
I think there is another place where version is not adjusted with repacksuffix. I'm using this bug but I can open another one if you think this is another bug (and not another aspect of this bug). I've a package where I've a repacksuffix option is debian/watch and Files-Excluded in debian/copyright. "uscan --verbose" correctly works and repacks the upstream tarball. But, when invoked by "gbp import-orig --scan", here is what happened: uscan '--symlink' --destdir=.. '--dehs' <dehs> <package>picard-tools</package> <debian-uversion>1.113</debian-uversion> <debian-mangled-uversion>1.113</debian-mangled-uversion> <upstream-version>1.138</upstream-version> <upstream-url>https://github.com/broadinstitute/picard/archive/1.138.tar.gz</upstream-url> <status>Newer version available</status> <target>picard-tools-1.138.tar.gz</target> <target-path>../picard-tools-1.138.tar.gz</target-path> <messages>Successfully downloaded updated package picard-tools-1.138.tar.gz Successfully repacked ../picard-tools-1.138.tar.gz as ../picard-tools_1.138+dfsg.1.orig.tar.gz, deleting 5 files from it.</messages> </dehs> You can see that the <target> element does not say anything abouthte repack. The repack is only visible in the <messages> element. But gbp use the <target> element and import the upstream tarball and not the repacked tarball. So, it seems to me that <target> should have the repacked name in case of a repack. As a side note, when uscan does not download anything (because it is already downloaded), the dehs output is not really useful: $ uscan '--symlink' --destdir=.. '--dehs' <dehs> <package>picard-tools</package> <debian-uversion>1.113</debian-uversion> <debian-mangled-uversion>1.113</debian-mangled-uversion> <upstream-version>1.138</upstream-version> <upstream-url>https://github.com/broadinstitute/picard/archive/1.138.tar.gz</upstream-url> </dehs> There is no reference to the upstream downloaded tarball (../picard-tools-1.138.tar.gz) nor to the repacked tarball (../picard-tools_1.138+dfsg.1.orig.tar.gz). gbp, for example, try to guess the correct output but fails is this case (it searches for ../1.138.tar.gz) Perhaps, uscan should always print the (correct) target in dehs mode. Regards, Vincent
