Unverified Commit 03b1f081 authored by Pierre-Elliott Bécue's avatar Pierre-Elliott Bécue 👌🏻
Browse files

uscan: Add short archive extensions (tbz, txz, tgz) into the @ARCHIVE_EXT@... 

uscan: Add short archive extensions (tbz, txz, tgz) into the @ARCHIVE_EXT@ regexp. (Closes: #823624)
parent 82951444

debian/changelog

+4 −0
Original line number Diff line number Diff line 
devscripts (2.18.2) UNRELEASED; urgency=medium



  [ Daniel Kahn Gillmor ]

  * uscan:

    + Add short archive extensions (tbz, txz, tgz) into the @ARCHIVE_EXT@

      regexp. (Closes: #823624)



 -- Mattia Rizzolo <mattia@debian.org>  Tue, 06 Mar 2018 16:27:47 +0100

scripts/uscan.pl

+3 −3
Original line number Diff line number Diff line
@@ -269,13 +269,13 @@ This is substituted by the legal upstream version regex (capturing). 


This is substituted by the typical archive file extension regex (non-capturing).



  (?i)\.(?:tar\.xz|tar\.bz2|tar\.gz|zip)

  (?i)\.(?:tar\.xz|tar\.bz2|tar\.gz|zip|tgz|tbz|txz)



=item B<@SIGNATURE_EXT@>



This is substituted by the typical signature file extension regex (non-capturing).



  (?i)\.(?:tar\.xz|tar\.bz2|tar\.gz|zip)\.(?:asc|pgp|gpg|sig|sign)

  (?i)\.(?:tar\.xz|tar\.bz2|tar\.gz|zip|tgz|tbz|txz)\.(?:asc|pgp|gpg|sig|sign)



=back
@@ -2681,7 +2681,7 @@ sub process_watchfile ($$$$) 


	# Handle @PACKAGE@ @ANY_VERSION@ @ARCHIVE_EXT@ substitutions

	my $any_version = '[-_]?(\d[\-+\.:\~\da-zA-Z]*)';

	my $archive_ext = '(?i)\.(?:tar\.xz|tar\.bz2|tar\.gz|zip)';

	my $archive_ext = '(?i)\.(?:tar\.xz|tar\.bz2|tar\.gz|zip|tgz|tbz|txz)';

	my $signature_ext = $archive_ext . '\.(?:asc|pgp|gpg|sig|sign)';

	s/\@PACKAGE\@/$package/g;

	s/\@ANY_VERSION\@/$any_version/g;