[devscripts] 01/05: uscan: MUT, allow "orig-<component>" in the filename

[Osamu Aoki]

This is an automated email from the git hooks/post-receive script.

osamu pushed a commit to branch master
in repository devscripts.

commit b7c55eef6716b9c78bb28349434a7e942be8bcca
Author: Osamu Aoki <osamu at debian.org>
Date:   Sun Aug 20 01:36:00 2017 +0900

    uscan: MUT, allow "orig-<component>" in the filename
---
 scripts/uscan.pl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 7d1c738..2cb803a 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -3744,7 +3744,7 @@ EOF
 	$path = $1 if $mk_origtargz_out =~ /Successfully .* (?:to|as) ([^,]+)(?:,.*)?\.$/;
 	$path = $1 if $mk_origtargz_out =~ /Leaving (.*) where it is/;
 	$target = basename($path);
-	$common_mangled_newversion = $1 if $target =~ m/[^_]+_(.+)\.orig\.tar\.(?:gz|bz2|lzma|xz)$/;
+	$common_mangled_newversion = $1 if $target =~ m/[^_]+_(.+)\.orig(?:-.+)?\.tar\.(?:gz|bz2|lzma|xz)$/;
 	uscan_verbose "New orig.tar.* tarball version (after mk-origtargz): $common_mangled_newversion\n";
     }
     push @origtars, $target;

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git