[ack] 03/03: Update changelog + refresh patch for new upstream dev release 2.15_03

[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 ef34eced6e9502c5732ee1a8108f994d3bac881b
Author: Axel Beckert <abe at deuxchevaux.org>
Date:   Sun Mar 5 19:26:58 2017 +0100

    Update changelog + refresh patch for new upstream dev release 2.15_03
---
 debian/changelog                                   |  6 ++-
 .../no-standalone-test-but-autopkgtests.patch      | 44 ++++++++--------------
 2 files changed, 19 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a99acfa..a570cb4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,11 @@
-ack (2.15.01-3) UNRELEASED; urgency=medium
+ack (2.15.03-1) UNRELEASED; urgency=medium
 
   [ Axel Beckert ]
   * Merge changes from Debian Stretch.
+  * Import new upstream development release (labeled "2.15_03" upstream)
+    + Refresh sole patch.
 
- -- gregor herrmann <gregoa at debian.org>  Sat, 24 Oct 2015 13:44:20 +0200
+ -- Axel Beckert <abe at debian.org>  Sun, 05 Mar 2017 19:29:30 +0100
 
 ack (2.14-5) unstable; urgency=low
 
diff --git a/debian/patches/no-standalone-test-but-autopkgtests.patch b/debian/patches/no-standalone-test-but-autopkgtests.patch
index 72cae0d..d2ff86a 100644
--- a/debian/patches/no-standalone-test-but-autopkgtests.patch
+++ b/debian/patches/no-standalone-test-but-autopkgtests.patch
@@ -18,10 +18,8 @@ Description: Misuse $ACK_TEST_STANDALONE to switch between build-/installed-time
 Author: Axel Beckert <abe at debian.org>
 Forwarded: not-needed
 
-Index: ack-grep/Makefile.PL
-===================================================================
---- ack-grep.orig/Makefile.PL	2015-02-15 01:43:39.687734440 +0100
-+++ ack-grep/Makefile.PL	2015-02-15 01:43:39.683733734 +0100
+--- a/Makefile.PL
++++ b/Makefile.PL
 @@ -124,12 +124,12 @@
  	$(CP) $(ACK) ~/bin/ack2
  	$(CP) ackrc ~/.ack2rc
@@ -37,10 +35,8 @@ Index: ack-grep/Makefile.PL
  
  test_standalone: all ack-standalone
  	$(FULLPERLRUN) t/runtests.pl 1 $(TEST_VERBOSE) "$(INST_LIB)" "$(INST_ARCHLIB)" $(TEST_FILES)
-Index: ack-grep/t/runtests.pl
-===================================================================
---- ack-grep.orig/t/runtests.pl	2015-02-15 01:43:39.687734440 +0100
-+++ ack-grep/t/runtests.pl	2015-02-15 01:43:39.683733734 +0100
+--- a/t/runtests.pl
++++ b/t/runtests.pl
 @@ -16,5 +16,5 @@
  open STDIN, '<', '/dev/null';
  
@@ -48,10 +44,8 @@ Index: ack-grep/t/runtests.pl
 -       $ENV{ACK_TEST_STANDALONE} ? 'ack-standalone' : 'blib/script/ack');
 +       $ENV{ACK_TEST_STANDALONE} ? '/usr/bin/ack' : 'blib/script/ack');
  test_harness(shift, shift, shift);
-Index: ack-grep/t/Util.pm
-===================================================================
---- ack-grep.orig/t/Util.pm	2015-02-15 01:43:39.687734440 +0100
-+++ ack-grep/t/Util.pm	2015-02-15 01:43:39.683733734 +0100
+--- a/t/Util.pm
++++ b/t/Util.pm
 @@ -125,8 +125,8 @@
          unshift( @args, '--noenv' );
      }
@@ -81,10 +75,8 @@ Index: ack-grep/t/Util.pm
                      unshift( @cmd, $perl );
                  }
                  else {
-Index: ack-grep/t/command-line-files.t
-===================================================================
---- ack-grep.orig/t/command-line-files.t	2015-02-15 01:43:39.687734440 +0100
-+++ ack-grep/t/command-line-files.t	2015-02-15 01:43:39.683733734 +0100
+--- a/t/command-line-files.t
++++ b/t/command-line-files.t
 @@ -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'} ) {
@@ -94,12 +86,10 @@ Index: ack-grep/t/command-line-files.t
  EOF
      }
      else {
-Index: ack-grep/t/ack-x.t
-===================================================================
---- ack-grep.orig/t/ack-x.t	2015-02-15 01:43:39.687734440 +0100
-+++ ack-grep/t/ack-x.t	2015-02-15 01:43:39.683733734 +0100
+--- a/t/ack-x.t
++++ b/t/ack-x.t
 @@ -98,7 +98,7 @@
- my @lhs_args = ( $perl, '-Mblib', build_ack_invocation( '-g', 'of', 't/text' ) );
+ my @lhs_args = ( $perl, '-Mblib', build_ack_invocation( '--sort-files', '-g', 'of', 't/text' ) );
  my @rhs_args = ( $perl, '-Mblib', build_ack_invocation( '-x', 'the' ) ); # for now
  
 -if ( $ENV{'ACK_TEST_STANDALONE'} ) {
@@ -107,10 +97,8 @@ Index: ack-grep/t/ack-x.t
      @lhs_args = grep { $_ ne '-Mblib' } @lhs_args;
      @rhs_args = grep { $_ ne '-Mblib' } @rhs_args;
  }
-Index: ack-grep/t/process-substitution.t
-===================================================================
---- ack-grep.orig/t/process-substitution.t	2015-02-15 01:43:39.687734440 +0100
-+++ ack-grep/t/process-substitution.t	2015-02-15 01:43:39.683733734 +0100
+--- a/t/process-substitution.t
++++ b/t/process-substitution.t
 @@ -51,7 +51,7 @@
      # XXX doing this by hand here eq '=('
      my $perl = caret_X();
@@ -120,10 +108,8 @@ Index: ack-grep/t/process-substitution.t
          unshift( @args, $perl );
      }
      else {
-Index: ack-grep/t/lib/00-coverage.t
-===================================================================
---- ack-grep.orig/t/lib/00-coverage.t	2015-02-15 01:43:39.687734440 +0100
-+++ ack-grep/t/lib/00-coverage.t	2015-02-15 01:43:39.683733734 +0100
+--- a/t/lib/00-coverage.t
++++ b/t/lib/00-coverage.t
 @@ -11,6 +11,10 @@
  
  use Test::More;

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