Bug#796986: uscan: repacksuffix does not ajust version passed to uupdate

[James McCoy]

On Thu, Aug 27, 2015 at 12:00:50AM +0900, Osamu Aoki wrote:
> Although mk-origtargz add suffix to the generated tarball, uscan does
> not adjust the version passed to uupdate.

Thanks for spotting this.  It does need to be corrected.

> From 09d41dc3674ff428a36caa48b2c1f0ad9d1889f9 Mon Sep 17 00:00:00 2001
> From: Osamu Aoki <osamu at debian.org>
> 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)

There shouldn't be a need to assume.  $repack is set if a repack was
requested, so an adjustment should be moved into the previous if block
(which is what calls mk-origtargz).

Cheers,
-- 
James
GPG Key: 4096R/331BA3DB 2011-12-05 James McCoy <jamessan at debian.org>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 949 bytes
Desc: Digital signature
URL: <http://lists.alioth.debian.org/pipermail/devscripts-devel/attachments/20150826/30783c75/attachment.sig>