Package: devscripts Version: 2.15.3 Severity: normal Tags: patch Although mk-origtargz add suffix to the generated tarball, uscan does not adjust the version passed to uupdate.
I think it is desiarable to apply attached patch. This patch is against git HEAD (so version 2.15.8 is affected). FYI: Although it is not documented and it has no practical use as of now, the current uscan code allows us to write multiple entries after the "version=3" line to download source files with some problem. With relatively minor patch, this can be made to download secondary tarballs properly for multi-tarball source files. ... it is working here. Let me do some code polishing ... Osamu -- Package-specific info: --- /etc/devscripts.conf --- --- ~/.devscripts --- DEBUILD_DPKG_BUILDPACKAGE_OPTS="-i -us -uc" DEBUILD_LINTIAN_OPTS="-i -I --show-overrides" DEBSIGN_KEYID="1DD8D791" -- System Information: Debian Release: 8.1 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'proposed-updates'), (500, 'stable'), (99, 'testing'), (98, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 3.16.0-4-amd64 (SMP w/4 CPU cores) Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages devscripts depends on: ii dpkg-dev 1.17.25 ii libc6 2.19-18 ii perl 5.20.2-3+deb8u1 ii python3 3.4.2-2 pn python3:any <none> Versions of packages devscripts recommends: ii at 3.1.16-1 ii curl 7.38.0-4+deb8u2 ii dctrl-tools 2.23 ii debian-keyring 2015.04.10 ii dput 0.9.6.4 ii equivs 2.0.9 ii fakeroot 1.20.2-1 ii file 1:5.22+15-2 ii gnupg 1.4.18-7 ii libdistro-info-perl 0.14 ii libencode-locale-perl 1.03-1 ii libjson-perl 2.61-1 ii liblwp-protocol-https-perl 6.06-2 ii libparse-debcontrol-perl 2.005-4 ii libsoap-lite-perl 1.11-1 ii liburi-perl 1.64-1 ii libwww-perl 6.08-1 ii lintian 2.5.35~bpo8+1 ii man-db 2.7.0.2-5 ii patch 2.7.5-1 ii patchutils 0.3.3-1 ii python3-debian 0.1.27 ii python3-magic 1:5.22+15-2 ii sensible-utils 0.0.9 ii strace 4.9-2 ii unzip 6.0-16 ii wdiff 1.2.2-1 ii wget 1.16-1 ii xz-utils 5.1.1alpha+20120614-2+b3 Versions of packages devscripts suggests: ii bsd-mailx [mailx] 8.1.2-0.20141216cvs-2 ii build-essential 11.7 pn cvs-buildpackage <none> pn debbindiff <none> pn devscripts-el <none> pn gnuplot <none> ii gpgv 1.4.18-7 ii libauthen-sasl-perl 2.1600-1 ii libfile-desktopentry-perl 0.07-1 ii libnet-smtp-ssl-perl 1.01-3 pn libterm-size-perl <none> ii libtimedate-perl 2.3000-2 ii libyaml-syck-perl 1.27-2+b2 ii mutt 1.5.23-3 ii openssh-client [ssh-client] 1:6.7p1-5 pn svn-buildpackage <none> ii w3m 0.5.3-19 -- no debconf information
>From 09d41dc3674ff428a36caa48b2c1f0ad9d1889f9 Mon Sep 17 00:00:00 2001 From: Osamu Aoki <[email protected]> Date: Wed, 26 Aug 2015 09:31:40 +0000 Subject: [PATCH 2/2] repacksuffix needs to be taken care --- scripts/uscan.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/uscan.pl b/scripts/uscan.pl index 33f3ad4..ef21e2c 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -1522,6 +1522,11 @@ EOF $target = basename($path); } + if (defined $options{'repacksuffix'}) { + # assume it was repacked (if wasn't, remove opts=repacksuffix in watchfile) + $newversion = $newversion . $options{'repacksuffix'} + } + if ($dehs) { my $msg = "Successfully downloaded updated package $newfile_base\n"; if (defined $mk_origtargz_out) { -- 2.1.4
_______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
