diff options
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | po/de.po | 2 | ||||
| -rw-r--r-- | quilt.changes | 7 | ||||
| -rw-r--r-- | quilt/upgrade.in | 2 | ||||
| -rw-r--r-- | scripts/patchfns.in | 6 |
6 files changed, 15 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 6fcee0c..22cee20 100644 --- a/Makefile.in +++ b/Makefile.in @@ -122,7 +122,7 @@ SRC += changes2changelog #----------------------------------------------------------------------- -all : scripts $(LINGUAS:%=po/%.mo) +all : scripts $(COMPAT_PROGRAMS:%=compat/%) $(LINGUAS:%=po/%.mo) $(LIB:%=lib/%) : $(LIB_SRC:%.c=lib/%.o) $(CC) -o $@ $(LDFLAGS) $^ $(LIBS) diff --git a/configure.ac b/configure.ac index b0dc555..d798b0a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT([quilt],[0.42],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) AC_PREREQ(2.53) -AC_REVISION ($Revision: 1.50 $) +AC_REVISION ($Revision: 1.51 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -179,7 +179,7 @@ QUILT_COMPAT_PROG_PATH(MTA, mta, [sendmail]) PATH=$old_PATH if ! echo $COMPAT_PROGRAMS $COMPAT_SYMLINKS | grep -q mta; then - COMPAT_SYMLINKS="$COMPAT_SYMLINKS mta" + COMPAT_PROGRAMS="$COMPAT_PROGRAMS mta" fi AC_ARG_ENABLE(nls, AC_HELP_STRING( @@ -139,7 +139,7 @@ msgstr "" "\n" "Erzeuge ein Listing der angegebenen Datei das anzeigt, welche\n" "Patches welche Zeilen verändern. Nur angewandte Patches werden\n" -"angezeigt." +"angezeigt.\n" "\n" "-p patch\n" "\tNur bis zum angegebenen Patch anstatt bis zum obersten Patch\n" diff --git a/quilt.changes b/quilt.changes index 0ccb3c0..efc00e4 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Sun Sep 18 17:59:03 CEST 2005 - agruen@suse.de + +- Makefile.in: Add a dependency of all to COMPAT_PROGRAMS which + was lost somewhere. Fix internal "mta" program. +- Get rid of ``grep -E''. + +------------------------------------------------------------------- Sun Sep 18 17:41:56 CEST 2005 - agruen@suse.de - Fix a few things in po/quilt.pot generation. diff --git a/quilt/upgrade.in b/quilt/upgrade.in index fb0c5e3..9a12610 100644 --- a/quilt/upgrade.in +++ b/quilt/upgrade.in @@ -76,7 +76,7 @@ printf $"Converting meta-data to version %s\n" "$DB_VERSION" for patch in $(applied_patches) do - proper_name="$(grep -E '^'"$(quote_re $patch)"'(|\.patch|\.diff?)(|\.gz|\.bz2)([ \t]|$)' $SERIES)" + proper_name="$(grep "^$(quote_bre $patch)"'\(\|\.patch\|\.diff?\)\(\|\.gz\|\.bz2\)\([ \t]\|$\)' $SERIES)" proper_name=${proper_name#$QUILT_PATCHES/} proper_name=${proper_name%% *} if [ -z "$proper_name" ] diff --git a/scripts/patchfns.in b/scripts/patchfns.in index 965c4a4..79494d6 100644 --- a/scripts/patchfns.in +++ b/scripts/patchfns.in @@ -189,7 +189,7 @@ patch_in_series() then return 1 else - grep -q -E "^$(quote_re $patch)([ \t]|$)" $SERIES + grep -q "^$(quote_bre $patch)\([ \t]\|$\)" $SERIES fi } @@ -326,7 +326,7 @@ is_applied() { local patch=$1 [ -e $DB ] || return 1 - grep -q -E "^$(quote_re $patch)\$" $DB + grep -q "^$(quote_bre $patch)\$" $DB } applied_patches() @@ -419,7 +419,7 @@ remove_from_db() local tmpfile if tmpfile=$(gen_tempfile) then - grep -v -E "^$(quote_re $patch)\$" $DB > $tmpfile + grep -v "^$(quote_bre $patch)\$" $DB > $tmpfile cat $tmpfile > $DB rm -f $tmpfile [ -s $DB ] || rm -f $DB |