This is an automated email from the git hooks/post-receive script. mattia pushed a commit to branch stretch in repository devscripts.
commit c1de508cb6fc74d711ea223e51247cbf3eafa9c7 Author: Osamu Aoki <[email protected]> Date: Fri Jul 28 23:32:34 2017 +0900 Ensure newversion match to be greedy Closes: #869150 Signed-off-by: Mattia Rizzolo <[email protected]> --- debian/changelog | 8 ++++++++ scripts/uscan.pl | 2 +- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 5da4167..f36fbce 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +devscripts (2.17.6+deb9u2) UNRELEASED; urgency=medium + + [ Osamu Aoki ] + * uscan: + + Fix the new package version regex for filenamemangle. Closes: #869150 + + -- Mattia Rizzolo <[email protected]> Sat, 30 Sep 2017 22:19:56 +0200 + devscripts (2.17.6+deb9u1) stretch; urgency=medium [ Mattia Rizzolo ] diff --git a/scripts/uscan.pl b/scripts/uscan.pl index dd1f423..58a11b0 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -3291,7 +3291,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 _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
