[ack] 02/02: Refresh sole patch for new upstream release

[Axel Beckert]

This is an automated email from the git hooks/post-receive script.

abe pushed a commit to branch master
in repository ack.

commit 94a2e1394012935ed5c1f1a026f8f72b4dcb58c1
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Tue Dec 12 03:09:03 2017 +0100

    Refresh sole patch for new upstream release
---
 debian/changelog                                         |  7 +++++++
 debian/patches/no-standalone-test-but-autopkgtests.patch | 12 ++++++------
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 192c9d6..7d6342c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ack (2.20-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+    + Refresh sole patch.
+
+ -- Axel Beckert <abe at debian.org>  Tue, 12 Dec 2017 03:09:03 +0100
+
 ack (2.19.01-1) unstable; urgency=low
 
   * New upstream release candidate.
diff --git a/debian/patches/no-standalone-test-but-autopkgtests.patch b/debian/patches/no-standalone-test-but-autopkgtests.patch
index ea89485..8708a09 100644
--- a/debian/patches/no-standalone-test-but-autopkgtests.patch
+++ b/debian/patches/no-standalone-test-but-autopkgtests.patch
@@ -47,7 +47,7 @@ Last-Update: 2017-03-05
  test_harness(shift, shift, shift);
 --- a/t/Util.pm
 +++ b/t/Util.pm
-@@ -125,8 +125,8 @@
+@@ -175,8 +175,8 @@
          unshift( @args, '--noenv' );
      }
  
@@ -58,7 +58,7 @@ Last-Update: 2017-03-05
      }
      else {
          unshift( @args, File::Spec->rel2abs( 'blib/script/ack', $orig_wd ) );
-@@ -352,7 +352,7 @@
+@@ -404,7 +404,7 @@
      my $perl = caret_X();
  
      @args = build_ack_invocation( @args );
@@ -67,7 +67,7 @@ Last-Update: 2017-03-05
          unshift( @args, $perl );
      }
      else {
-@@ -609,7 +609,7 @@
+@@ -661,7 +661,7 @@
  
                  my $perl = caret_X();
  
@@ -78,10 +78,10 @@ Last-Update: 2017-03-05
                  else {
 --- a/t/command-line-files.t
 +++ b/t/command-line-files.t
-@@ -55,7 +55,7 @@
+@@ -54,7 +54,7 @@
      # I don't care for this, but it's the least of the evils I could think of
      if ( $ENV{'ACK_TEST_STANDALONE'} ) {
-         @expected_stderr = split( /\n/, <<'EOF' );
+         @expected_stderr = line_split( <<'EOF' );
 -ack-standalone: non-existent-file.txt: No such file or directory
 +ack: non-existent-file.txt: No such file or directory
  EOF
@@ -89,7 +89,7 @@ Last-Update: 2017-03-05
      else {
 --- a/t/ack-x.t
 +++ b/t/ack-x.t
-@@ -82,7 +82,7 @@
+@@ -81,7 +81,7 @@
  my @lhs_args = ( $perl, '-Mblib', build_ack_invocation( '--sort-files', '-g', '[vz]', 't/text' ) );
  my @rhs_args = ( $perl, '-Mblib', build_ack_invocation( '-x', '-i', 'that' ) );
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ack.git