Don't put Maintainers_Versions-non-US in version controlled directory. Correct locat...

diff --git a/ChangeLog b/ChangeLog
index 929466c61ece3ba354a509ea68abcfe8632807f0..08641bf3c2d650d61da33ac876917590b045dcee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2006-06-11  James Troup  <troup@spohr.debian.org>
 
+       * 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 bf141039546e72d090089562432a9633113b72a1..c914b4c7b5499da44ba8440bea1f333fe7a51e00 100755 (executable)
--- 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