diff options
| -rw-r--r-- | Makefile.in | 3 | ||||
| -rw-r--r-- | TODO | 6 | ||||
| -rw-r--r-- | bin/quilt.in | 5 | ||||
| -rw-r--r-- | quilt.changes | 6 | ||||
| -rw-r--r-- | quilt.quiltrc | 13 |
5 files changed, 25 insertions, 8 deletions
diff --git a/Makefile.in b/Makefile.in index 06ba25b..fe38539 100644 --- a/Makefile.in +++ b/Makefile.in @@ -46,7 +46,7 @@ DIRT += $(shell find -name '.\#*') SRC += COPYING AUTHORS TODO BUGS Makefile.in \ configure.ac config/install-sh \ quilt.spec.in quilt.changes \ - bash_completion + bash_completion quilt.quiltrc DIRT += quilt.spec BIN_IN := quilt guards @@ -252,6 +252,7 @@ install : scripts @INSTALL@ -d $(BUILD_ROOT)$(etcdir) @INSTALL@ -d $(BUILD_ROOT)$(etcdir)/bash_completion.d @INSTALL@ -m 644 bash_completion $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt + @INSTALL@ -m 644 quilt.quiltrc $(BUILD_ROOT)$(etcdir)/ clean : rm -f $(DIRT) @@ -54,12 +54,6 @@ apatch: Needs to check if any of the files in the patch are touched by later patches. -quilt diff: - - - The number of context lines cannot be overridden in QUILT_DIFF_OPTS: - GNU diff uses three context lines as soon as -u or -U3 is on the - command line, no matter which other arguments are specified. - quit edit: - Check for actual changes, and remove files again that haven't been diff --git a/bin/quilt.in b/bin/quilt.in index 7a2abfb..c88a648 100644 --- a/bin/quilt.in +++ b/bin/quilt.in @@ -11,7 +11,10 @@ export TEXTDOMAINDIR=@LOCALEDIR@ if [ -z "$QUILTRC" ] then - export QUILTRC=$HOME/.quiltrc + for QUILTRC in $HOME/.quiltrc /etc/quilt.quiltrc; do + [ -e $QUILTRC ] && break + done + export QUILTRC fi usage() diff --git a/quilt.changes b/quilt.changes index 40acd49..070029f 100644 --- a/quilt.changes +++ b/quilt.changes @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Tue Jan 11 03:53:19 CET 2005 - agruen@suse.de + +- Add a default /etc/quilt.quiltrc file that is sourced if no + ~/.quiltrc file exists. + +------------------------------------------------------------------- Fri Nov 19 13:02:32 CET 2004 - agruen@suse.de - Push command: Write out output of patch process immediately diff --git a/quilt.quiltrc b/quilt.quiltrc new file mode 100644 index 0000000..6a1318b --- /dev/null +++ b/quilt.quiltrc @@ -0,0 +1,13 @@ +# Example /etc/quilt.quiltrc + +# Options passed to GNU diff when generating patches +QUILT_DIFF_OPTS="--show-c-function" +# Options passed to GNU patch when applying patches +#QUILT_PATCH_OPTS="--ignore-whitespace" + +# Options to pass to commands (QUILT_${COMMAND}_ARGS) +QUILT_DIFF_ARGS="--no-timestamps --color=auto" +QUILT_REFRESH_ARGS="--no-timestamps --backup" + +# Prefix all patch names with the relative path to the patch? +QUILT_PATCHES_PREFIX=yes |