re-enable die on unlink failures and refresh

diff --git a/debian/patches/die_on_unlink_failures b/debian/patches/die_on_unlink_failures
index 7b4d3d99116955fbe34d72d72066d3782f80a5c4..165cc2c652e931e54931e06f39d45edb9dcfff41 100644 (file)
--- a/debian/patches/die_on_unlink_failures
+++ b/debian/patches/die_on_unlink_failures
@@ -1,11 +1,9 @@
 Description: die if perltidy.ERR and other temporary files cannot be unlinked
 Origin: Upstream, Cherrypicked from 20170521.
 Author: Don Armstrong <don@debian.org>, Steve Hancock
-diff --git a/lib/Perl/Tidy.pm b/lib/Perl/Tidy.pm
-index 2b0df0e..edcec6d 100644
 --- a/lib/Perl/Tidy.pm
 +++ b/lib/Perl/Tidy.pm
-@@ -3692,7 +3702,10 @@ sub do_syntax_check {
+@@ -3643,7 +3643,10 @@
      # now wish for luck...
      my $msg = qx/perl $flags $quoted_stream_filename $error_redirection/;
  
@@ -17,7 +15,7 @@ index 2b0df0e..edcec6d 100644
      return $stream_filename, $msg;
  }
  
-@@ -4128,7 +4143,11 @@ sub new {
+@@ -4074,7 +4077,11 @@
  
      # remove any old error output file if we might write a new one
      unless ( $fh_warnings || ref($warning_file) ) {

diff --git a/debian/patches/series b/debian/patches/series
index 9b1049a47296ab6692d1a8e6e0f0b0528e0436a7..a54562cc7d262382b47ea90838b740cf1a8c3fd6 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+die_on_unlink_failures
 document_bst_better