[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#178706: grep: NMU uploaded



retitle 178706 NMU(2): grep
thanks

Hi, this is to inform you that I have uploaded an NMU of grep to
DELAYED/7-day. This NMU is mainly to address the [ef]grep issue. 
Changelog: 

grep (2.4.2-3.2) unstable; urgency=low

  * NMU
  * Move [ef]grep back to /bin by request on -devel, and replace them
    with wrapper scripts (to address concerns by people who need to
    squeeze space out of /bin). Note that this does NOT sanction scripts
    that broke because they hardcoded the path to [ef]grep to be /bin;
    bugs will still be filed against them for that. (Closes: #176264)

 -- Hwei Sheng Teoh <hsteoh@debian.org>  Mon, 27 Jan 2003 17:42:55 -0500


These scripts have been running on my own system for about 2 weeks now,
and there has been no breakage so far, so I assume everything is OK.
Please let me know if there are any problems with the new wrapper scripts.

If the package maintainer has any objections to this NMU, he should feel
free to remove the package from the DELAYED queue. Thanks!


T

-- 
Turning your clock 15 minutes ahead won't cure lateness---you're just making
time go faster!
diff -Nru grep-2.4.2.ORIG/debian/changelog grep-2.4.2/debian/changelog
--- grep-2.4.2.ORIG/debian/changelog	2003-01-27 17:42:38.000000000 -0500
+++ grep-2.4.2/debian/changelog	2003-01-27 17:50:34.000000000 -0500
@@ -1,3 +1,14 @@
+grep (2.4.2-3.2) unstable; urgency=low
+
+  * NMU
+  * Move [ef]grep back to /bin by request on -devel, and replace them
+    with wrapper scripts (to address concerns by people who need to
+    squeeze space out of /bin). Note that this does NOT sanction scripts
+    that broke because they hardcoded the path to [ef]grep to be /bin;
+    bugs will still be filed against them for that. (Closes: #176264)
+
+ -- Hwei Sheng Teoh <hsteoh@debian.org>  Mon, 27 Jan 2003 17:42:55 -0500
+
 grep (2.4.2-3.1) unstable; urgency=low
 
   * NMU
diff -Nru grep-2.4.2.ORIG/debian/egrep grep-2.4.2/debian/egrep
--- grep-2.4.2.ORIG/debian/egrep	1969-12-31 19:00:00.000000000 -0500
+++ grep-2.4.2/debian/egrep	2003-01-27 17:47:46.000000000 -0500
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+exec grep -E "$@"
+
diff -Nru grep-2.4.2.ORIG/debian/fgrep grep-2.4.2/debian/fgrep
--- grep-2.4.2.ORIG/debian/fgrep	1969-12-31 19:00:00.000000000 -0500
+++ grep-2.4.2/debian/fgrep	2003-01-27 17:47:53.000000000 -0500
@@ -0,0 +1,4 @@
+#! /bin/sh
+
+exec grep -F "$@"
+
diff -Nru grep-2.4.2.ORIG/debian/rules grep-2.4.2/debian/rules
--- grep-2.4.2.ORIG/debian/rules	2003-01-27 17:42:38.000000000 -0500
+++ grep-2.4.2/debian/rules	2003-01-27 20:32:56.000000000 -0500
@@ -35,13 +35,11 @@
 	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/usr \
+	make prefix=`pwd`/debian/tmp/usr exec_prefix=`pwd`/debian/tmp \
 		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/usr/bin/egrep
-	strip -R .note -R .comment `pwd`/debian/tmp/usr/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
@@ -69,6 +67,11 @@
 	install -p -o root -g root -m 755 debian/rgrep debian/tmp/usr/bin
 	ln -s grep.1.gz debian/tmp/usr/share/man/man1/rgrep.1.gz
 
+# Install egrep and fgrep wrappers so that we don't clutter /bin with
+# almost-identical binaries.
+	install -p -o root -g root -m 755 debian/egrep debian/tmp/bin
+	install -p -o root -g root -m 755 debian/fgrep debian/tmp/bin
+
 # Finish the installation
 	install -p -o root -g root -m 755 debian/preinst debian/tmp/DEBIAN/
 	install -p -o root -g root -m 755 debian/postinst debian/tmp/DEBIAN/
diff -Nru grep-2.4.2.ORIG/src/Makefile.am grep-2.4.2/src/Makefile.am
--- grep-2.4.2.ORIG/src/Makefile.am	2000-02-29 00:21:36.000000000 -0500
+++ grep-2.4.2/src/Makefile.am	2003-01-27 17:53:45.000000000 -0500
@@ -8,7 +8,8 @@
 # We let configure figure out if we need the regex.c or not
 # it is provided in GNU/Linux system
 # regex.c regex.h
-bin_PROGRAMS = grep egrep fgrep
+#bin_PROGRAMS = grep egrep fgrep
+bin_PROGRAMS = grep
 base_sources = grep.c grep.h \
                dfa.c dfa.h \
                kwset.c  kwset.h \

Reply to: