chiark
/
gitweb
/
~ian
/
pcre3.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rebase patch queue onto upstream 8.39:
[pcre3.git]
/
debian
/
patches
/
pcregrep.1-patch
diff --git
a/debian/patches/pcregrep.1-patch
b/debian/patches/pcregrep.1-patch
index 40123694c593d8b979afd0fac404ef814c7b8a07..4ecab6f27e9cb07433558b2c17a8a1e3b0076192 100644
(file)
--- a/
debian/patches/pcregrep.1-patch
+++ b/
debian/patches/pcregrep.1-patch
@@
-1,11
+1,15
@@
From: Mark Baker <mark@mnb.org.uk>
From: Mark Baker <mark@mnb.org.uk>
-Description: Mention zpcregrep wrapper script in pcregrep man page.
+Date: Wed, 13 Jul 2016 21:20:13 +0100
+Subject: pcregrep.1-patch
+---
+ doc/pcregrep.1 | 4 ++++
+ 1 file changed, 4 insertions(+)
-
Index: pcre3
/doc/pcregrep.1
-===================================================================
----
pcre3.orig/doc/pcregrep.1 2014-04-04 14:37:38.000000000 +0100
-+++
pcre3/doc/pcregrep.1 2015-12-22 12:39:07.000000000 +0000
+
diff --git a/doc/pcregrep.1 b
/doc/pcregrep.1
+index 9886675..07b8f57 100644
+---
a/doc/pcregrep.1
++++
b/doc/pcregrep.1
@@ -3,6 +3,7 @@
pcregrep - a grep with Perl-compatible regular expressions.
.SH SYNOPSIS
@@ -3,6 +3,7 @@
pcregrep - a grep with Perl-compatible regular expressions.
.SH SYNOPSIS
@@
-14,7
+18,7
@@
Index: pcre3/doc/pcregrep.1
.
.SH DESCRIPTION
.rs
.
.SH DESCRIPTION
.rs
-@@ -87,6 +88,9 @@
+@@ -87,6 +88,9 @@
the matching substrings are being shown.
If the \fBLC_ALL\fP or \fBLC_CTYPE\fP environment variable is set,
\fBpcregrep\fP uses the value to set a locale when calling the PCRE library.
The \fB--locale\fP option can be used to override this.
If the \fBLC_ALL\fP or \fBLC_CTYPE\fP environment variable is set,
\fBpcregrep\fP uses the value to set a locale when calling the PCRE library.
The \fB--locale\fP option can be used to override this.