From a32b62d74840c2c51fe6b0f00ed25d8871a8f988 Mon Sep 17 00:00:00 2001 From: Andrea Pappacoda Date: Sat, 10 Sep 2022 13:25:19 +0200 Subject: [PATCH] uscan: add v prefix in @ANY_VERSION@ This allows uscan to automatically look for upstream version tags like "v1.0.2". Before this patch, one had to manually prefix @ANY_VERSION@ with the letter 'v'. Gbp-Dch: Full --- lib/Devscripts/Uscan/WatchFile.pm | 2 +- po4a/po/de.po | 4 ++-- po4a/po/devscripts.pot | 2 +- po4a/po/fr.po | 4 ++-- po4a/po/pt.po | 4 ++-- scripts/uscan.pl | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/lib/Devscripts/Uscan/WatchFile.pm b/lib/Devscripts/Uscan/WatchFile.pm index 5958127d..06ab61df 100644 --- a/lib/Devscripts/Uscan/WatchFile.pm +++ b/lib/Devscripts/Uscan/WatchFile.pm @@ -104,7 +104,7 @@ use List::Util qw/first/; use Moo; use constant { - ANY_VERSION => '(?:[-_]?(\d[\-+\.:\~\da-zA-Z]*))', + ANY_VERSION => '(?:[-_]?v?(\d[\-+\.:\~\da-zA-Z]*))', ARCHIVE_EXT => '(?i)(?:\.(?:tar\.xz|tar\.bz2|tar\.gz|tar\.zstd?|zip|tgz|tbz|txz))', DEB_EXT => '(?:[\+~](debian|dfsg|ds|deb)(\.)?(\d+)?$)', diff --git a/po4a/po/de.po b/po4a/po/de.po index e5d4fde8..8e3fa43f 100644 --- a/po4a/po/de.po +++ b/po4a/po/de.po @@ -23690,10 +23690,10 @@ msgstr "" #: ../scripts/uscan.pl:289 #, no-wrap msgid "" -" [-_]?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" +" [-_]?v?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" "\n" msgstr "" -" [-_]?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" +" [-_]?v?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" "\n" #. type: =item diff --git a/po4a/po/devscripts.pot b/po4a/po/devscripts.pot index ec297acb..803042aa 100644 --- a/po4a/po/devscripts.pot +++ b/po4a/po/devscripts.pot @@ -19322,7 +19322,7 @@ msgstr "" #: ../scripts/uscan.pl:289 #, no-wrap msgid "" -" [-_]?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" +" [-_]?v?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" "\n" msgstr "" diff --git a/po4a/po/fr.po b/po4a/po/fr.po index e521904c..385b64b9 100644 --- a/po4a/po/fr.po +++ b/po4a/po/fr.po @@ -23976,10 +23976,10 @@ msgstr "" #: ../scripts/uscan.pl:289 #, no-wrap msgid "" -" [-_]?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" +" [-_]?v?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" "\n" msgstr "" -" [-_]?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" +" [-_]?v?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" "\n" #. type: =item diff --git a/po4a/po/pt.po b/po4a/po/pt.po index 427bac1e..a47df32a 100644 --- a/po4a/po/pt.po +++ b/po4a/po/pt.po @@ -23613,10 +23613,10 @@ msgstr "" #: ../scripts/uscan.pl:289 #, no-wrap msgid "" -" [-_]?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" +" [-_]?v?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" "\n" msgstr "" -" [-_]?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" +" [-_]?v?(\\d[\\-+\\.:\\~\\da-zA-Z]*)\n" "\n" #. type: =item diff --git a/scripts/uscan.pl b/scripts/uscan.pl index 6cc486a0..c7011ad1 100755 --- a/scripts/uscan.pl +++ b/scripts/uscan.pl @@ -286,7 +286,7 @@ F file. This is substituted by the legal upstream version regex (capturing). - [-_]?(\d[\-+\.:\~\da-zA-Z]*) + [-_]?v?(\d[\-+\.:\~\da-zA-Z]*) =item B<@ARCHIVE_EXT@> -- GitLab