tidy up .quiltrc

1 files changed, 13 insertions, 13 deletions

diff --git a/.quiltrc b/.quiltrc
index 8db85ad7..79acb9c4 100644
--- a/.quiltrc
+++ b/.quiltrc
@@ -1,16 +1,16 @@
-# all from:
-# https://raphaelhertzog.com/2012/08/08/how-to-use-quilt-to-manage-patches-in-debian-packages/
+# -*- sh -*-
 
-# detect Debian quilt patches
-for where in ./ ../ ../../ ../../../ ../../../../ ../../../../../; do
-    if [ -e ${where}debian/rules -a -d ${where}debian/patches ]; then
-        export QUILT_PATCHES=debian/patches
-        break
+# Use debian/patches unless it is dominated by a patches/ with a series file.
+file="$PWD"
+while true; do
+    if [ ! \( -O "$file" -o -G "$file" \) -o "$file" = / -o -e \
+	   "$file/${QUILT_PATCHES:-patches}/${QUILT_SERIES:-series}" ]; then
+	break
+    elif [ -e "$file/debian/rules" -a -d "$file/debian/patches" ]; then
+	QUILT_PATCHES=debian/patches
+	break
+    else
+	file="$(dirname "$file")"
     fi
 done
-
-# generate nicer patches & use colour
-QUILT_PUSH_ARGS="--color=auto"
-QUILT_DIFF_ARGS="--no-timestamps --no-index -p ab --color=auto"
-QUILT_REFRESH_ARGS="--no-timestamps --no-index -p ab"
-QUILT_DIFF_OPTS='-p'
+unset file