[devscripts] 01/01: Ensure newversion match to be greedy

[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 e010bd50ab1eda38713f80d5c33d95afd49ab28f
Author: Osamu Aoki <osamu at debian.org>
Date:   Fri Jul 28 23:32:34 2017 +0900

    Ensure newversion match to be greedy
    
    Fix bug #869150.
---
 debian/changelog | 4 ++++
 scripts/uscan.pl | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 985f586..4ac4404 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,10 @@ devscripts (2.17.10) UNRELEASED; urgency=medium
   * debuild:
     + Add "--" in --help output for debian/rules mode.
 
+  [ Osamu Aoki ]
+  * uscan:
+    + Fix the new package version regex for filenamemangle.  Closes: #869150
+
  -- Mattia Rizzolo <mattia at debian.org>  Tue, 25 Jul 2017 14:18:24 +0200
 
 devscripts (2.17.9) unstable; urgency=medium
diff --git a/scripts/uscan.pl b/scripts/uscan.pl
index 2eace8f..393f8da 100755
--- a/scripts/uscan.pl
+++ b/scripts/uscan.pl
@@ -3292,7 +3292,7 @@ EOF
 	}
 	unless ($newversion) {
 	    # uversionmanglesd version is '', make best effort to set it
-	    $newfile_base =~ m/^.+[-_]?(\d[\-+\.:\~\da-zA-Z]*)(?:\.tar\.(gz|bz2|xz)|\.zip)$/i;
+	    $newfile_base =~ m/^.+?[-_]?(\d[\-+\.:\~\da-zA-Z]*)(?:\.tar\.(gz|bz2|xz)|\.zip)$/i;
 	    $newversion = $1;
 	    unless ($newversion) {
 		uscan_warn "Fix filenamemangle to produce a filename with the correct version\n";

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