diff options
| -rw-r--r-- | Makefile.in | 13 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt/add.in | 1 | ||||
| -rw-r--r-- | quilt/applied.in | 5 | ||||
| -rw-r--r-- | quilt/delete.in | 1 | ||||
| -rw-r--r-- | quilt/diff.in | 5 | ||||
| -rw-r--r-- | quilt/edit.in | 4 | ||||
| -rw-r--r-- | quilt/files.in | 5 | ||||
| -rw-r--r-- | quilt/fold.in | 1 | ||||
| -rw-r--r-- | quilt/fork.in | 3 | ||||
| -rw-r--r-- | quilt/import.in | 5 | ||||
| -rw-r--r-- | quilt/new.in | 5 | ||||
| -rw-r--r-- | quilt/next.in | 5 | ||||
| -rw-r--r-- | quilt/patches.in | 5 | ||||
| -rw-r--r-- | quilt/pop.in | 5 | ||||
| -rw-r--r-- | quilt/previous.in | 5 | ||||
| -rw-r--r-- | quilt/push.in | 5 | ||||
| -rw-r--r-- | quilt/refresh.in | 5 | ||||
| -rw-r--r-- | quilt/remove.in | 5 | ||||
| -rw-r--r-- | quilt/series.in | 5 | ||||
| -rw-r--r-- | quilt/setup.in | 4 | ||||
| -rw-r--r-- | quilt/snapshot.in | 5 | ||||
| -rw-r--r-- | quilt/top.in | 5 | ||||
| -rw-r--r-- | quilt/unapplied.in | 5 |
24 files changed, 32 insertions, 81 deletions
diff --git a/Makefile.in b/Makefile.in index 6f6402d..90c67f2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -125,14 +125,15 @@ doc/README : doc/README.in done 2>&1 < $< > $@ .PHONY :: reference -reference : $(QUILT:%=quilt/%) - @for i in $+; \ +reference : $(QUILT:%=quilt/%) scripts/patchfns + @dir=$(CURDIR); \ + for i in $(filter-out scripts/patchfns,$+); \ do \ - echo "$$i >> README" >&2; \ echo; \ - (bash -c ". scripts/patchfns ;LC_ALL=C . $$i -h"); \ + (bash -c ". scripts/patchfns ; cd $$dir ;LC_ALL=C . $$i -h"); \ + echo; \ done | \ - sed -e 's/^Usage: \?//' -e 's/^/ /' + sed -e '/^Usage:/{s/^Usage: \?//;b}' -e '/^$$/!s/^/ /' bin/guards.1 : bin/guards mkdir -p $$(dirname $@) @@ -174,7 +175,7 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile \ | scripts/parse-patch -u changelog $@ % : %.in - @echo "$< -> $@" + @echo "$< -> $@" >&2 @sed -e 's:@LIB''@:$(LIB_DIR):g' \ -e 's:@QUILT''@:$(QUILT_DIR):g' \ -e 's:@SCRIPTS''@:$(SCRIPTS_DIR):g' \ diff --git a/quilt.changes b/quilt.changes index 242fc72..d72d4dc 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Sat Jan 31 14:05:22 CET 2004 - agruen@suse.de + +- Fix generating doc/README after subdirectory support broke it. +- Remove excessive newlines in -h messages. + +------------------------------------------------------------------- Wed Jan 28 02:42:40 CET 2004 - agruen@suse.de - Fix bugs introduced while merging Chris's patch. diff --git a/quilt/add.in b/quilt/add.in index d93ee2a..8589475 100644 --- a/quilt/add.in +++ b/quilt/add.in @@ -23,7 +23,6 @@ usage() if [ x$1 = x-h ] then echo $" - Add one or more files to the topmost or named patch. Files must be added to the patch before being modified. Files that are modified by patches on top of the specified patch cannot be added. diff --git a/quilt/applied.in b/quilt/applied.in index 33a2cc3..ea28a29 100644 --- a/quilt/applied.in +++ b/quilt/applied.in @@ -23,13 +23,10 @@ usage() if [ x$1 = x-h ] then echo $" - Print a list of applied patches, or all patches up to and including the specified patch in the file series. --n Print patch file names instead of patch names. - -" +-n Print patch file names instead of patch names." exit 0 else diff --git a/quilt/delete.in b/quilt/delete.in index cd4bdf8..132b9d8 100644 --- a/quilt/delete.in +++ b/quilt/delete.in @@ -23,7 +23,6 @@ usage() if [ x$1 = x-h ] then echo $" - Remove the specified or topmost patch from the series file. If the patch is applied, quilt will attempt to remove it first. (Only the topmost patch can be removed right now.)" diff --git a/quilt/diff.in b/quilt/diff.in index 4c0465a..79d992a 100644 --- a/quilt/diff.in +++ b/quilt/diff.in @@ -29,7 +29,6 @@ usage() if [ x$1 = x-h ] then echo $" - Produces a diff of the specified file(s) in the topmost or specified patch. If no files are specified, all files that are modified are included. @@ -52,9 +51,7 @@ included. --diff=utility Use the specified utility for generating the diff. The utility - is invoked with the original and new file name as arguments. - -" + is invoked with the original and new file name as arguments." exit 0 else exit 1 diff --git a/quilt/edit.in b/quilt/edit.in index 4385015..6a2a36d 100644 --- a/quilt/edit.in +++ b/quilt/edit.in @@ -14,10 +14,8 @@ usage() if [ x$1 = x-h ] then echo $" - Edit the specified file(s) in $EDITOR after adding it (them) to the -topmost patch. -" +topmost patch." exit 0 else exit 1 diff --git a/quilt/files.in b/quilt/files.in index 3db405e..1d1453c 100644 --- a/quilt/files.in +++ b/quilt/files.in @@ -23,12 +23,9 @@ usage() if [ x$1 = x-h ] then echo $" - Print the list of files that the topmost or specified patch changes. --v Verbose, more user friendly output. - -" +-v Verbose, more user friendly output." exit 0 else exit 1 diff --git a/quilt/fold.in b/quilt/fold.in index 71825fc..5e9cb02 100644 --- a/quilt/fold.in +++ b/quilt/fold.in @@ -23,7 +23,6 @@ usage() if [ x$1 = x-h ] then echo $" - Integrate the patch read from standard input into the topmost patch: After making sure that all files modified are part of the topmost patch, the patch is applied with the specified strip level (which diff --git a/quilt/fork.in b/quilt/fork.in index 9864176..853c942 100644 --- a/quilt/fork.in +++ b/quilt/fork.in @@ -26,8 +26,7 @@ usage() Fork the next patch. If new_name is missing, the name of the forked patch will be the current patch name, followed by \"-2\". If the patch name already ends in a dash-and-number, the number is -further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff). -" +further incremented (e.g., patch.diff, patch-2.diff, patch-3.diff)." exit 0 else exit 1 diff --git a/quilt/import.in b/quilt/import.in index 3ae54d1..b325f3a 100644 --- a/quilt/import.in +++ b/quilt/import.in @@ -23,7 +23,6 @@ usage() if [ x$1 = x-h ] then echo $" - Import an external patch. If a patch file name is specified, the patch will be stored in this relative path in the patches/ directory. Else, if an input file name is given this name is used as the patch name. @@ -34,9 +33,7 @@ if an input file name is given this name is used as the patch name. -n patch File name relative to patches/ to use. --f Overwite/update existing patches. - -" +-f Overwite/update existing patches." exit 0 else exit 1 diff --git a/quilt/new.in b/quilt/new.in index 5ec86d6..86058d4 100644 --- a/quilt/new.in +++ b/quilt/new.in @@ -23,11 +23,8 @@ usage() if [ x$1 = x-h ] then echo $" - Create a new patch with the specified file name, and insert it after the -topmost patch in the patch series file. - -" +topmost patch in the patch series file." exit 0 else exit 1 diff --git a/quilt/next.in b/quilt/next.in index 9e2ca64..9de460a 100644 --- a/quilt/next.in +++ b/quilt/next.in @@ -23,13 +23,10 @@ usage() if [ x$1 = x-h ] then echo $" - Print the name of the next patch after the specified or topmost patch in the series file. --n Print patch file names instead of patch names. - -" +-n Print patch file names instead of patch names." exit 0 else exit 1 diff --git a/quilt/patches.in b/quilt/patches.in index 5a77075..69e2885 100644 --- a/quilt/patches.in +++ b/quilt/patches.in @@ -23,16 +23,13 @@ usage() if [ x$1 = x-h ] then echo $" - Print the list of patches that modify the specified file. (Uses a heuristic to determine which files are modified by unapplied patches. Note that this heuristic is much slower than scanning applied patches.) -n Print the patch file names instead of the patch names. --v Verbose, more user friendly output. - -" +-v Verbose, more user friendly output." exit 0 else exit 1 diff --git a/quilt/pop.in b/quilt/pop.in index ecd6719..9700912 100644 --- a/quilt/pop.in +++ b/quilt/pop.in @@ -23,7 +23,6 @@ usage() if [ x$1 = x-h ] then echo $" - Remove patch(es) from the current stack. A number of patches to remove, or a patch name can be specified. If a patch name is given, remove all patches applied on top of the named patch. If neither a number nor a @@ -39,9 +38,7 @@ patch name is specified, remove the next patch from the series file. -q Quiet operation. --v Verbose operation. - -" +-v Verbose operation." exit 0 else exit 1 diff --git a/quilt/previous.in b/quilt/previous.in index 36bfb30..0d335de 100644 --- a/quilt/previous.in +++ b/quilt/previous.in @@ -23,13 +23,10 @@ usage() if [ x$1 = x-h ] then echo $" - Print the name of the previous patch before the specified or topmost patch in the series file. --n Print patch file names instead of patch names. - -" +-n Print patch file names instead of patch names." exit 0 else exit 1 diff --git a/quilt/push.in b/quilt/push.in index 20c6074..b1c8685 100644 --- a/quilt/push.in +++ b/quilt/push.in @@ -23,7 +23,6 @@ usage() if [ x$1 = x-h ] then echo $" - Apply patch(es) from the series file. A number of patches to apply, or a patch name can be specified. If a patch name is given, apply all patches up to and including the named patch. If neither a number nor a @@ -44,9 +43,7 @@ patch name is specified, apply the next patch from the series file. --interactive Allow the patch utility to ask how to deal with conflicts. If this option is not given, the option -f will be passed to the - patch program. - -" + patch program." exit 0 else exit 1 diff --git a/quilt/refresh.in b/quilt/refresh.in index 99de471..465e113 100644 --- a/quilt/refresh.in +++ b/quilt/refresh.in @@ -29,7 +29,6 @@ usage() if [ x$1 = x-h ] then echo $" - Refreshes the specified patch, or the topmost patch by default. Documentation that comes before the actual patch in the patch file is retained. @@ -45,9 +44,7 @@ patch. -p n Create a -p n style patch (-p0 or -p1 supported). -f Force refresh, even if more recent patches modify - some of the same files. - -" + some of the same files." exit 0 else exit 1 diff --git a/quilt/remove.in b/quilt/remove.in index 976a9fd..08d8fea 100644 --- a/quilt/remove.in +++ b/quilt/remove.in @@ -23,14 +23,11 @@ usage() if [ x$1 = x-h ] then echo $" - Remove one or more files from the topmost or named patch. Files that are modified by patches on top of the specified patch cannot be removed. -p patch - Patch to remove files from. - -" + Patch to remove files from." exit 0 else exit 1 diff --git a/quilt/series.in b/quilt/series.in index bd26c82..dca5002 100644 --- a/quilt/series.in +++ b/quilt/series.in @@ -23,14 +23,11 @@ usage() if [ x$1 = x-h ] then echo $" - Print the names of all patches in the series file. -n Print patch file names instead patch names. --v Verbose, more user friendly output. - -" +-v Verbose, more user friendly output." exit 0 else exit 1 diff --git a/quilt/setup.in b/quilt/setup.in index 107050e..410bf4b 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -23,7 +23,6 @@ usage() if [ x$1 = x-h ] then echo $" - Initializes a source tree from a patch series file. The patch series file must contain the name of the relevant tar archive, in addition to the list of patches. @@ -32,8 +31,7 @@ the list of patches. to the directory of the series/spec file. -l Make the patches directory a symbolic link. If a series file is - specified, also create a symlink to the series file. -" + specified, also create a symlink to the series file." exit 0 else exit 1 diff --git a/quilt/snapshot.in b/quilt/snapshot.in index dc5ba60..91cbb4c 100644 --- a/quilt/snapshot.in +++ b/quilt/snapshot.in @@ -23,12 +23,9 @@ usage() if [ x$1 = x-h ] then echo $" - Take a snapshot of the current working state. --d Remove current snapshot. - -" +-d Remove current snapshot." exit 0 else exit 1 diff --git a/quilt/top.in b/quilt/top.in index 904ea0e..4153bf1 100644 --- a/quilt/top.in +++ b/quilt/top.in @@ -23,11 +23,8 @@ usage() if [ x$1 = x-h ] then echo $" - Print the name of the topmost patch on the current stack of applied -patches. - -" +patches." exit 0 else exit 1 diff --git a/quilt/unapplied.in b/quilt/unapplied.in index 854ff40..f200719 100644 --- a/quilt/unapplied.in +++ b/quilt/unapplied.in @@ -23,13 +23,10 @@ usage() if [ x$1 = x-h ] then echo $" - Print a list of patches that are not applied, or all patches that follow the specified patch in the series file. --n Print patch file names instead of patch names. - -" +-n Print patch file names instead of patch names." exit 0 else exit 1 |