diff options
| author | Andreas Gruenbacher <agruen@suse.de> | 2006-01-22 02:00:36 +0000 |
|---|---|---|
| committer | Andreas Gruenbacher <agruen@suse.de> | 2006-01-22 02:00:36 +0000 |
| commit | 07f1e42679e540896467e78cfc0b830c8e1d9b8c (patch) | |
| tree | f4eb5ce779d4900a8ad9fbde3684c418d0c7df66 | |
| parent | 3024d4e49a6df6caf089dc3efb2f49bd6ca7c792 (diff) | |
| download | quilt-07f1e42679e540896467e78cfc0b830c8e1d9b8c.tar.gz | |
- USE_NLS fix.
- Replace egrep with grep.
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | debian/patchsys-quilt.mk | 2 | ||||
| -rw-r--r-- | debian/quilt.debbuild.mk | 4 | ||||
| -rw-r--r-- | quilt.changes | 2 |
4 files changed, 5 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index eeeff04..50e1283 100644 --- a/Makefile.in +++ b/Makefile.in @@ -408,7 +408,7 @@ distclean : clean rm -f config.log config.status Makefile rm -rf autom4te.cache/ -ifeq ($(USE_NLS),1) +ifeq ($(USE_NLS),yes) install-main :: for lang in $(LINGUAS) ; do \ dir=$(BUILD_ROOT)$(localedir)/$$lang/LC_MESSAGES; \ diff --git a/debian/patchsys-quilt.mk b/debian/patchsys-quilt.mk index 704459e..f485a99 100644 --- a/debian/patchsys-quilt.mk +++ b/debian/patchsys-quilt.mk @@ -76,7 +76,7 @@ if lsdiff=`which lsdiff` ; then \ | tr "\n" " "`; \ if [ "x$$patchlist" != x ] ; then \ $$lsdiff -H $$patchlist \ - | egrep "/config\.(guess|sub|rpath)$$" | tr "\n" " " ; \ + | grep "/config\.\(guess\|sub\|rpath\)$$" | tr "\n" " " ; \ fi;\ fi) ifneq (, $(evil_patches_that_do_nasty_things)) diff --git a/debian/quilt.debbuild.mk b/debian/quilt.debbuild.mk index 3ea82e0..66cbb39 100644 --- a/debian/quilt.debbuild.mk +++ b/debian/quilt.debbuild.mk @@ -261,7 +261,7 @@ clean-dsc: FORCE list=`grep-dctrl -s Files -n . $$changes|\ sed 's/^ *//'|\ cut -d' ' -f5|\ - egrep -v '\.dsc$$'`;\ + grep -v '\.dsc$$'`;\ rm -i $$list $$changes; \ fi; \ \ @@ -271,7 +271,7 @@ clean-dsc: FORCE list=`grep-dctrl -s Files -n . $$dsc|\ sed 's/^ *//'|\ cut -d' ' -f3|\ - egrep -v '\.orig.tar.gz$$'`; \ + grep -v '\.orig\.tar\.gz$$'`; \ rm -i $$list $$dsc; \ fi; \ done diff --git a/quilt.changes b/quilt.changes index 9e70f1f..daa33b3 100644 --- a/quilt.changes +++ b/quilt.changes @@ -92,7 +92,7 @@ Thu Jan 19 17:34:05 CET 2006 - agruen@suse.de - Make sure quilt diff --snapshot visits files in a defined order. ------------------------------------------------------------------- -Thu Jan 19 18:52:30 AEDT 2006 - jayvdb@gmail.com +Thu Jan 19 18:52:30 +1100 2006 - jayvdb@gmail.com - Move patch parameter checks into patchfns.in, adding quotes around all patch parameters, and reporting 'No patches in series' |