From 7771d74fa2701a43e1e8a0fae4533abafb64fb57 Mon Sep 17 00:00:00 2001 From: James Troup Date: Sun, 11 Jun 2006 17:40:05 -0700 Subject: [PATCH] Don't put Maintainers_Versions-non-US in version controlled directory. Correct location of pseudo-packages.maintainers file. --- ChangeLog | 5 +++++ scripts/debian/mkmaintainers | 6 +++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 929466c6..08641bf3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2006-06-11 James Troup + * scripts/debian/mkmaintainers: put Maintainers_Versions-non-US in + $base/misc/ instead of versioned $masterdir. Correct 'dak + make-maintainers' invocation to look in $configdir for + pseudo-packages.maintainers. + * daklib/queue.py (Upload.do_reject): use correct name for rejection template. diff --git a/scripts/debian/mkmaintainers b/scripts/debian/mkmaintainers index bf141039..c914b4c7 100755 --- a/scripts/debian/mkmaintainers +++ b/scripts/debian/mkmaintainers @@ -5,9 +5,9 @@ echo -n 'Creating Maintainers index ... ' set -e . $SCRIPTVARS -cd $masterdir +cd $base/misc/ -nonusmaint="$masterdir/Maintainers_Versions-non-US" +nonusmaint="$base/misc/Maintainers_Versions-non-US" if wget -T15 -q -O Maintainers_Versions-non-US.gz http://non-us.debian.org/indices-non-US/Maintainers_Versions.gz; then @@ -17,7 +17,7 @@ if wget -T15 -q -O Maintainers_Versions-non-US.gz http://non-us.debian.org/indic fi cd $indices -dak make-maintainers $nonusmaint $masterdir/pseudo-packages.maintainers | sed -e "s/~[^ ]*\([ ]\)/\1/" | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers +dak make-maintainers $nonusmaint $configdir/pseudo-packages.maintainers | sed -e "s/~[^ ]*\([ ]\)/\1/" | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers set +e cmp .new-maintainers Maintainers >/dev/null -- 2.39.5