the control files has moved to ../etc, so use it from there

[next-scripts] / do_merge

diff --git a/do_merge b/do_merge
index 13fd3c90c03a5d3b443e7bae3225112ba2424557..59f1ea9bfda131b620467cbb6faea1f2fb6dadba 100755 (executable)
--- a/do_merge
+++ b/do_merge
@@ -107,7 +107,7 @@ do_rebase()
 
 }
 
-heads=$(grep -v '^#' ../real_control | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
+heads=$(grep -v '^#' ../etc/control | awk -F '\t' '$2=="quilt" || $2=="git" { printf("%s/%s ", $3, $5); }')
 
 need_build=false
 
@@ -168,7 +168,7 @@ for h in $heads; do
        }
        $need_build ||
                continue
-       do_build=$(grep -v '^#' ../real_control | awk -F '      ' '$3=="'$tree'" { print $6; }')
+       do_build=$(grep -v '^#' ../etc/control | awk -F '       ' '$3=="'$tree'" { print $6; }')
        [ "$do_build" = "yes" ] ||
                continue
        git push -f "$build_host":"$build_dir" master:refs/heads/next || {