update changelog to 20220613-1, update remove iso8859 patch

diff --git a/debian/changelog b/debian/changelog
index 2bd56f7bacf8d26ec375c23d1b6a5d26c72891ff..b0131e26b36ce43b8d65390f89490486aa5188bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+perltidy (20220613-1) unstable; urgency=medium
+
+  * New upstream version
+     - Fixes UTF-8 issue with perl critic (closes: #998367)
+
+ -- Don Armstrong <don@debian.org>  Wed, 27 Jul 2022 16:26:29 -0700
+
 perltidy (20220217-1) unstable; urgency=medium
 
   * New upstream version (closes: #1011467)

diff --git a/debian/patches/remove_iso8859_in_tokenizer b/debian/patches/remove_iso8859_in_tokenizer
index fa8b7d1ad99f0979c7a12a4fa47d62c2814977ae..31d840755d2794a6d3f7e3938957a69aebcb6e4e 100644 (file)
--- a/debian/patches/remove_iso8859_in_tokenizer
+++ b/debian/patches/remove_iso8859_in_tokenizer
@@ -1,11 +1,11 @@
 --- a/lib/Perl/Tidy/Tokenizer.pm
 +++ b/lib/Perl/Tidy/Tokenizer.pm
-@@ -6919,7 +6919,7 @@
+@@ -7608,7 +7608,7 @@
  
-             elsif ( $tok eq '{' ) {
+         elsif ( $tok eq '{' ) {
  
--                # check for something like ${#} or ${©}
-+                # check for something like ${#} or ${@}
-                 if (
-                     (
-                            $identifier eq '$'
+-            # check for something like ${#} or ${©}
++            # check for something like ${#} or ${@}
+             if (
+                 (
+                        $identifier eq '$'