Control: tags 1042525 + patch Control: tags 1042525 + pending
Dear maintainer, I've prepared an NMU for localehelper (versioned as 0.1.4-3.1) and uploaded it to DELAYED/5. Please feel free to tell me if I should delay it longer. Regards. -- .''`. https://info.comodo.priv.at -- Debian Developer https://www.debian.org : :' : OpenPGP fingerprint D1E1 316E 93A7 60A8 104D 85FA BB3A 6801 8649 AA06 `. `' Member VIBE!AT & SPI Inc. -- Supporter Free Software Foundation Europe `-
diff -Nru localehelper-0.1.4/debian/changelog localehelper-0.1.4/debian/changelog --- localehelper-0.1.4/debian/changelog 2017-10-18 22:55:23.000000000 +0200 +++ localehelper-0.1.4/debian/changelog 2023-11-17 21:19:05.000000000 +0100 @@ -1,3 +1,12 @@ +localehelper (0.1.4-3.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix "FTBFS with Perl 5.38: t/help.t failure": add patch from two upstream + commits to replace given/when with plain if's. + (Closes: #1042525) + + -- gregor herrmann <gre...@debian.org> Fri, 17 Nov 2023 21:19:05 +0100 + localehelper (0.1.4-3) unstable; urgency=medium * Updated priority to optional due to extra being deprecated diff -Nru localehelper-0.1.4/debian/patches/given_when.patch localehelper-0.1.4/debian/patches/given_when.patch --- localehelper-0.1.4/debian/patches/given_when.patch 1970-01-01 01:00:00.000000000 +0100 +++ localehelper-0.1.4/debian/patches/given_when.patch 2023-11-17 21:18:57.000000000 +0100 @@ -0,0 +1,98 @@ +From af9dabda61314d79500824bcea888efcfabbc2a2 Mon Sep 17 00:00:00 2001 +From: Jakub Wilk <jw...@jwilk.net> +Date: Thu, 24 Aug 2023 21:32:31 +0200 +Subject: [PATCH] Stop using switch statements. + +Fixes: + + given is deprecated at .../localehelper line 153. + when is deprecated at .../localehelper line 154. + when is deprecated at .../localehelper line 159. + when is deprecated at .../localehelper line 167. + when is deprecated at .../localehelper line 171. + +https://bugs.debian.org/1042525 +--- + localehelper | 46 +++++++++++++++++++++------------------------- + 1 file changed, 21 insertions(+), 25 deletions(-) + + + +From ef6ca54a5b570bda80c12094355439e4f68f3722 Mon Sep 17 00:00:00 2001 +From: Jakub Wilk <jw...@jwilk.net> +Date: Mon, 28 Aug 2023 13:39:26 +0200 +Subject: [PATCH] Fix arg parsing control flow. + +Fixes: commit af9dabda61314d79500824bcea888efcfabbc2a2 +--- + localehelper | 2 ++ + 1 file changed, 2 insertions(+) + + +--- a/localehelper ++++ b/localehelper +@@ -30,7 +30,6 @@ + use warnings; + + use v5.10; +-no if $] >= 5.018, warnings => 'experimental::smartmatch'; + + # cwd in @INC is harmful: + # http://www.nntp.perl.org/group/perl.perl5.porters/2010/08/msg162729.html +@@ -150,32 +149,31 @@ + my @extra_locales = (); + my %env = (); + while (scalar(@ARGV) > 0) { +- given ($ARGV[0]) { +- when (m/^($category_re)=(.*)$/) { +- my ($category, $locale) = ($1, $2); +- $env{$category} = $locale; +- shift @ARGV; +- } +- when ('-x') { +- shift @ARGV; +- if (not @ARGV) { +- diag('error: -x requires an argument'); +- exit 1; +- } +- push @extra_locales, split(m/,/, shift @ARGV); +- } +- when (['-h', '--help']) { +- show_usage(); +- exit 0; +- } +- when ('--') { +- shift @ARGV; +- last; +- } +- default { +- last; +- } ++ $_ = $ARGV[0]; ++ if (m/^($category_re)=(.*)$/) { ++ my ($category, $locale) = ($1, $2); ++ $env{$category} = $locale; ++ shift @ARGV; ++ next; ++ } ++ if ($_ eq '-x') { ++ shift @ARGV; ++ if (not @ARGV) { ++ diag('error: -x requires an argument'); ++ exit 1; ++ } ++ push @extra_locales, split(m/,/, shift @ARGV); ++ next; ++ } ++ if ($_ eq '-h' or $_ eq '--help') { ++ show_usage(); ++ exit 0; ++ } ++ if ($_ eq '--') { ++ shift @ARGV; ++ last; + } ++ last; + } + + if (not @ARGV) { diff -Nru localehelper-0.1.4/debian/patches/series localehelper-0.1.4/debian/patches/series --- localehelper-0.1.4/debian/patches/series 1970-01-01 01:00:00.000000000 +0100 +++ localehelper-0.1.4/debian/patches/series 2023-11-17 21:17:21.000000000 +0100 @@ -0,0 +1 @@ +given_when.patch
signature.asc
Description: Digital Signature
