quilt setup really wants to create the default quilt directories and not those that might have been autodetected by looking up parent directories. So instead of using $QUILT_PATCHES and $QUILT_SERIES, we hardcode "patches" and "series". Bug-Debian: http://bugs.debian.org/573689 diff --git a/quilt/setup.in b/quilt/setup.in index 75e7bf9..d07b40d 100644 --- a/quilt/setup.in +++ b/quilt/setup.in @@ -26,16 +26,16 @@ check_for_existing_files() { local dir status=0 for dir in $(awk ' $1 == "patch" { print $2 }' $tmpfile | uniq) do - if [ -e "$prefix$dir/$QUILT_PATCHES" ] + if [ -e "$prefix$dir/patches" ] then printf $"Directory %s exists\n" \ - "$prefix$dir/$QUILT_PATCHES" >&2 + "$prefix$dir/patches" >&2 status=1 fi - if [ -e "$prefix$dir/$QUILT_SERIES" ] + if [ -e "$prefix$dir/series" ] then printf $"File %s exists\n" \ - "$prefix$dir/$QUILT_SERIES" >&2 + "$prefix$dir/series" >&2 status=1 fi done @@ -200,15 +200,15 @@ do tar_file="$arg1" ;; patch) - [ -e "$prefix$dir/$QUILT_PATCHES" ] \ - || create_symlink "$sourcedir" "$prefix$dir/$QUILT_PATCHES" + [ -e "$prefix$dir/patches" ] \ + || create_symlink "$sourcedir" "$prefix$dir/patches" if [ -n "$series_file" ] then - [ -e "$prefix$dir/$QUILT_SERIES" ] \ + [ -e "$prefix$dir/series" ] \ || create_symlink "$series_file" \ - "$prefix$dir/$QUILT_SERIES" + "$prefix$dir/series" else - if ! [ -e "$prefix$dir/$QUILT_SERIES" ] + if ! [ -e "$prefix$dir/series" ] then ( echo "# Patch series file for quilt," \ "created by ${0##*/}" @@ -218,9 +218,9 @@ do && echo "# Source: $tar_file" echo "# Patchdir: $dir" echo "#" - ) > "$prefix$dir/$QUILT_SERIES" + ) > "$prefix$dir/series" fi - echo "$arg1" $arg2 >> "$prefix$dir/$QUILT_SERIES" + echo "$arg1" $arg2 >> "$prefix$dir/series" fi ;; esac