Package: grep
Severity: wishlist
Hi Robert,
I've applied some of the patches in BTS filed against grep, and have
prepared an NMU which fixes the following bugs: #158134, #127438, #93193,
#142206, #172524, #45943, #156479. The complete patch for the NMU is
attached with this mail.
Since you appear to be busy with other things, if I don't hear otherwise
from you within 2 weeks' time, I'll go ahead and upload the NMU. If you
have any objections, please let me know. Thanks!
T
--
The diminished 7th chord is the most flexible and fear-instilling chord. Use
it often, use it unsparingly, to subdue your listeners into submission!
diff -Nru grep-2.4.2.ORIG/debian/changelog grep-2.4.2/debian/changelog
--- grep-2.4.2.ORIG/debian/changelog 2002-12-10 08:45:49.000000000 -0500
+++ grep-2.4.2/debian/changelog 2002-12-10 15:23:37.000000000 -0500
@@ -1,3 +1,23 @@
+grep (2.4.2-3.1) unstable; urgency=low
+
+ * NMU
+ * doc/grep.1:
+ - re-word description of exit codes. (Closes: #158134)
+ - apply rgrep patch--thanks, Martin Michlmayr! (Closes: #127438)
+ * debian/rules:
+ - put only grep in /bin, fgrep and egrep in /usr/bin. (Closes: #93193)
+ - clean up po/*.gmo so that it is possible to rebuild without
+ dpkg-source aborting with "unrepresentable changes to binary files"
+ errors. (Closes: #142206)
+ - apply patch to remove bashisms (Closes: #172524)
+ * debian/control: add more descriptive paragraph to description
+ (Closes: #45943)
+ * debian/copyright: changed to reflect current maintainer.
+ (Closes: #156479)
+ * debian/postinst: no longer need to set /usr/doc link.
+
+ -- Hwei Sheng Teoh <[EMAIL PROTECTED]> Tue, 10 Dec 2002 08:46:16 -0500
+
grep (2.4.2-3) frozen unstable; urgency=low
* Updated dutch translation (Closes: #111313)
diff -Nru grep-2.4.2.ORIG/debian/control grep-2.4.2/debian/control
--- grep-2.4.2.ORIG/debian/control 2002-12-10 08:45:49.000000000 -0500
+++ grep-2.4.2/debian/control 2002-12-10 15:22:25.000000000 -0500
@@ -11,7 +11,11 @@
Pre-Depends: ${shlibs:Pre-Depends}
Conflicts: rgrep
Provides: rgrep
-Description: GNU grep, egrep and fgrep.
+Description: GNU grep, egrep and fgrep
+ 'grep' is a utility to search for text in files; it can be used from the
+ command line or in scripts. Even if you don't want to use it, other packages
+ on your system probably will.
+ .
The GNU family of grep utilities may be the "fastest grep in the west".
GNU grep is based on a fast lazy-state deterministic matcher (about
twice as fast as stock Unix egrep) hybridized with a Boyer-Moore-Gosper
diff -Nru grep-2.4.2.ORIG/debian/copyright grep-2.4.2/debian/copyright
--- grep-2.4.2.ORIG/debian/copyright 2002-12-10 08:45:49.000000000 -0500
+++ grep-2.4.2/debian/copyright 2002-12-10 11:06:50.000000000 -0500
@@ -1,7 +1,9 @@
This is the Debian GNU/Linux prepackaged version of the grep program.
-Currently Wichert Akkerman <[EMAIL PROTECTED]> maintains the
+Currently Robert van der Meulen <[EMAIL PROTECTED]> maintains the
Debian GNU/Linux version of grep.
+Wichert Akkerman <[EMAIL PROTECTED]> was the previous maintainer.
+
This package was created from the grep sources as found on the GNU
mirrors. Like all GNU software, grep is distritubed under the terms
of the GNU General Public License, version 2. On Debian GNU/Linux
diff -Nru grep-2.4.2.ORIG/debian/postinst grep-2.4.2/debian/postinst
--- grep-2.4.2.ORIG/debian/postinst 2002-12-10 08:45:49.000000000 -0500
+++ grep-2.4.2/debian/postinst 2002-12-10 15:23:11.000000000 -0500
@@ -12,8 +12,8 @@
--section "General commands" "General commands" \
/usr/share/info/grep.info.gz
-if [ -d /usr/doc -a ! -e /usr/doc/$pkg -a -d /usr/share/doc/$pkg ] ; then
- ln -s ../share/doc/$pkg /usr/doc/$pkg
-fi
+#if [ -d /usr/doc -a ! -e /usr/doc/$pkg -a -d /usr/share/doc/$pkg ] ; then
+# ln -s ../share/doc/$pkg /usr/doc/$pkg
+#fi
diff -Nru grep-2.4.2.ORIG/debian/rules grep-2.4.2/debian/rules
--- grep-2.4.2.ORIG/debian/rules 2002-12-10 08:45:49.000000000 -0500
+++ grep-2.4.2/debian/rules 2002-12-10 11:45:12.000000000 -0500
@@ -16,6 +16,7 @@
clean:
-make distclean
rm -f intl/libintl.h
+ rm -f po/*.gmo
rm -f stamp-build debian/files debian/substvars
rm -rf debian/tmp
@@ -28,21 +29,25 @@
binary-arch: checkroot
test -f stamp-build || make $(MFLAGS) -f debian/rules build
- -rm -rf debian/tmp debian/{files,substvars}
+ -rm -rf debian/tmp debian/files
+ -rm -rf debian/tmp debian/substvars
install -d -o root -g root -m 755 debian/tmp/DEBIAN
install -d -o root -g root -m 755 debian/tmp/usr/share/doc/$(package)
# Install grep
- make prefix=`pwd`/debian/tmp/usr exec_prefix=`pwd`/debian/tmp \
+ make prefix=`pwd`/debian/tmp/usr exec_prefix=`pwd`/debian/tmp/usr \
mandir=`pwd`/debian/tmp/usr/share/man
infodir=`pwd`/debian/tmp/usr/share/info install
+ mkdir -p `pwd`/debian/tmp/bin
+ mv `pwd`/debian/tmp/usr/bin/grep `pwd`/debian/tmp/bin/
strip -R .note -R .comment `pwd`/debian/tmp/bin/grep
- strip -R .note -R .comment `pwd`/debian/tmp/bin/egrep
- strip -R .note -R .comment `pwd`/debian/tmp/bin/fgrep
+ strip -R .note -R .comment `pwd`/debian/tmp/usr/bin/egrep
+ strip -R .note -R .comment `pwd`/debian/tmp/usr/bin/fgrep
# Now fix installation errors
find debian/tmp -type d | xargs chmod 755
gzip -9 debian/tmp/usr/share/man/man1/grep.1
- rm -f debian/tmp/usr/share/man/man1/{e,f}grep.1
+ rm -f debian/tmp/usr/share/man/man1/egrep.1
+ rm -f debian/tmp/usr/share/man/man1/fgrep.1
ln -s grep.1.gz debian/tmp/usr/share/man/man1/egrep.1.gz
ln -s grep.1.gz debian/tmp/usr/share/man/man1/fgrep.1.gz
gzip -9 debian/tmp/usr/share/info/grep.info
diff -Nru grep-2.4.2.ORIG/doc/grep.1 grep-2.4.2/doc/grep.1
--- grep-2.4.2.ORIG/doc/grep.1 2002-12-10 08:45:49.000000000 -0500
+++ grep-2.4.2/doc/grep.1 2002-12-10 13:40:48.000000000 -0500
@@ -15,7 +15,7 @@
.Id $Id: grep.1,v 1.11 2000/02/26 03:18:40 alainm Exp $
.TH GREP 1 \*(Dt "GNU Project"
.SH NAME
-grep, egrep, fgrep \- print lines matching a pattern
+grep, egrep, fgrep, rgrep \- print lines matching a pattern
.SH SYNOPSIS
.B grep
.RI [ options ]
@@ -45,10 +45,11 @@
.B grep
prints the matching lines.
.PP
-In addition, two variant programs
-.B egrep
-and
+In addition, three variant programs
+.BR egrep ,
.B fgrep
+and
+.BR rgrep
are available.
.B Egrep
is the same as
@@ -56,6 +57,9 @@
.B Fgrep
is the same as
.BR "grep\ \-F" .
+.B Rgrep
+is the same as
+.BR "grep\ \-r" .
.SH OPTIONS
.TP
.BI \-A " NUM" "\fR,\fP \-\^\-after-context=" NUM
@@ -621,9 +625,10 @@
.SH DIAGNOSTICS
.PP
Normally, exit status is 0 if matches were found,
-and 1 if no matches were found. (The
+and 1 if no matches were found. If the
.B \-v
-option inverts the sense of the exit status.)
+option is used, the exit status is 1 if the entire input matched,
+and 0 otherwise.
Exit status is 2 if there were syntax errors
in the pattern, inaccessible input files, or
other system errors.
