[ack-grep] 02/02: New upstream dev release: Drop cherry-picked patch, refresh other one
Axel Beckert
abe at deuxchevaux.org
Sun Feb 15 00:49:33 UTC 2015
This is an automated email from the git hooks/post-receive script.
abe pushed a commit to branch master
in repository ack-grep.
commit 32887ec7cdefa60d14ee78a02a90b30b41223ee0
Author: Axel Beckert <abe at deuxchevaux.org>
Date: Sun Feb 15 01:45:22 2015 +0100
New upstream dev release: Drop cherry-picked patch, refresh other one
---
debian/changelog | 8 ++++++
...504aa-make-sure-strings-match-along-lines.patch | 21 ---------------
.../no-standalone-test-but-autopkgtests.patch | 30 +++++++++++-----------
debian/patches/series | 1 -
4 files changed, 23 insertions(+), 37 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 94c6994..5d05e6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+ack-grep (2.15.01-1) UNRELEASED; urgency=low
+
+ * New upstream development release
+ + Drop cherry-picked patch.
+ + Refresh remaining patch
+
+ -- Axel Beckert <abe at debian.org> Sat, 14 Feb 2015 17:05:35 +0100
+
ack-grep (2.14-4) unstable; urgency=low
* Cherry-pick 17504aa from upstream. Fixes wrong results with
diff --git a/debian/patches/cherry-pick-17504aa-make-sure-strings-match-along-lines.patch b/debian/patches/cherry-pick-17504aa-make-sure-strings-match-along-lines.patch
deleted file mode 100644
index 5b018ab..0000000
--- a/debian/patches/cherry-pick-17504aa-make-sure-strings-match-along-lines.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Origin: commit 17504aa361eef269c57f43c21e16d1705cd1e7c0
-Author: Rob Hoelz <rob at hoelz.ro>
-Bug-Debian: https://bugs.debian.org/760870
-Bug: https://github.com/petdance/ack2/issues/491
-Bug: https://github.com/petdance/ack2/issues/498
-Description: Make sure strings match along lines
- This is redundant for most usages of ack, but fixes a bug when using -l.
-
-diff --git a/ack b/ack
-index e66f73a..852ec1c 100644
---- a/ack
-+++ b/ack
-@@ -331,7 +331,7 @@ sub build_regex {
- $str = "(?i)$str";
- }
-
-- my $re = eval { qr/$str/ };
-+ my $re = eval { qr/$str/m };
- if ( !$re ) {
- die "Invalid regex '$str':\n $@";
- }
diff --git a/debian/patches/no-standalone-test-but-autopkgtests.patch b/debian/patches/no-standalone-test-but-autopkgtests.patch
index fdc55a3..72cae0d 100644
--- a/debian/patches/no-standalone-test-but-autopkgtests.patch
+++ b/debian/patches/no-standalone-test-but-autopkgtests.patch
@@ -20,9 +20,9 @@ Forwarded: not-needed
Index: ack-grep/Makefile.PL
===================================================================
---- ack-grep.orig/Makefile.PL 2014-09-17 20:12:06.000000000 +0200
-+++ ack-grep/Makefile.PL 2014-09-17 20:12:06.000000000 +0200
-@@ -121,12 +121,12 @@
+--- 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
+@@ -124,12 +124,12 @@
$(CP) $(ACK) ~/bin/ack2
$(CP) ackrc ~/.ack2rc
@@ -39,8 +39,8 @@ Index: ack-grep/Makefile.PL
$(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 2014-09-17 20:12:06.000000000 +0200
-+++ ack-grep/t/runtests.pl 2014-09-17 20:12:06.000000000 +0200
+--- 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
@@ -16,5 +16,5 @@
open STDIN, '<', '/dev/null';
@@ -50,8 +50,8 @@ Index: ack-grep/t/runtests.pl
test_harness(shift, shift, shift);
Index: ack-grep/t/Util.pm
===================================================================
---- ack-grep.orig/t/Util.pm 2014-09-17 20:12:06.000000000 +0200
-+++ ack-grep/t/Util.pm 2014-09-17 20:12:06.000000000 +0200
+--- 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
@@ -125,8 +125,8 @@
unshift( @args, '--noenv' );
}
@@ -83,8 +83,8 @@ Index: ack-grep/t/Util.pm
else {
Index: ack-grep/t/command-line-files.t
===================================================================
---- ack-grep.orig/t/command-line-files.t 2014-09-17 20:12:06.000000000 +0200
-+++ ack-grep/t/command-line-files.t 2014-09-17 20:12:06.000000000 +0200
+--- 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
@@ -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'} ) {
@@ -96,8 +96,8 @@ Index: ack-grep/t/command-line-files.t
else {
Index: ack-grep/t/ack-x.t
===================================================================
---- ack-grep.orig/t/ack-x.t 2014-09-17 20:12:06.000000000 +0200
-+++ ack-grep/t/ack-x.t 2014-09-17 20:12:06.000000000 +0200
+--- 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
@@ -98,7 +98,7 @@
my @lhs_args = ( $perl, '-Mblib', build_ack_invocation( '-g', 'of', 't/text' ) );
my @rhs_args = ( $perl, '-Mblib', build_ack_invocation( '-x', 'the' ) ); # for now
@@ -109,8 +109,8 @@ Index: ack-grep/t/ack-x.t
}
Index: ack-grep/t/process-substitution.t
===================================================================
---- ack-grep.orig/t/process-substitution.t 2014-09-17 20:12:06.000000000 +0200
-+++ ack-grep/t/process-substitution.t 2014-09-17 20:12:06.000000000 +0200
+--- 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
@@ -51,7 +51,7 @@
# XXX doing this by hand here eq '=('
my $perl = caret_X();
@@ -122,8 +122,8 @@ Index: ack-grep/t/process-substitution.t
else {
Index: ack-grep/t/lib/00-coverage.t
===================================================================
---- ack-grep.orig/t/lib/00-coverage.t 2014-09-17 20:12:06.000000000 +0200
-+++ ack-grep/t/lib/00-coverage.t 2014-09-17 20:12:12.000000000 +0200
+--- 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
@@ -11,6 +11,10 @@
use Test::More;
diff --git a/debian/patches/series b/debian/patches/series
index 098f30a..0e70a34 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
no-standalone-test-but-autopkgtests.patch
-cherry-pick-17504aa-make-sure-strings-match-along-lines.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/ack-grep.git
More information about the Pkg-perl-cvs-commits
mailing list