X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.daily-non-US;h=6db70ea5f9b29256d2a9277b0e4c9273cd9af2c3;hb=96e609145626ff53653be4487416665a375f6510;hp=77b5626fa2c1ab180e74259e084006c04e7b4f9a;hpb=9958d0c2f3529d94446846e2e0757d536219ec7b;p=dak.git

diff --git a/cron.daily-non-US b/cron.daily-non-US
index 77b5626f..6db70ea5 100755
--- a/cron.daily-non-US
+++ b/cron.daily-non-US
@@ -37,9 +37,9 @@ update-readmenonus
 
 ################################################################################
 
-cd $incoming
+cd $accepted
 rm -f REPORT
-katie -pak *.changes | direport | tee REPORT | \
+katie -pa *.changes | tee REPORT | \
      mail -s "Non-US Install for $(date +%D)" ftpmaster@ftp-master.debian.org
 chgrp debadmin REPORT
 chmod 664 REPORT
@@ -49,10 +49,6 @@ symlinks -d -r $ftpdir
 
 cd $masterdir
 jenna
-# FIXME
-cd /org/non-us.debian.org/database/dists/
-rm -f proposed-updates_-_all.list
-for i in proposed-updates_-_binary-* proposed-updates_-_source.list; do cat $i >> proposed-updates_-_all.list; done
 
 # Generate override files
 cd $overridedir
@@ -69,12 +65,20 @@ ziyi
 
 # Clean out old packages
 rhona
+shania
 
+# Generate the Maintainers file
 cd $indices
-charisma > .new-maintainers
+charisma > .new-maintainers_versions
+mv -f .new-maintainers_versions Maintainers_Versions
+sed -e "s/~[^  ]*\([   ]\)/\1/" < Maintainers_Versions | awk '{printf "%-20s ", $1; for (i=2; i<=NF; i++) printf "%s ", $i; printf "\n";}' > .new-maintainers
 mv -f .new-maintainers Maintainers
 gzip -9v <Maintainers >.new-maintainers.gz
 mv -f .new-maintainers.gz Maintainers.gz
+gzip -9v <Maintainers_Versions >.new-maintainers_versions.gz
+mv -f .new-maintainers_versions.gz Maintainers_Versions.gz
+rm -f Maintainers_Versions
+
 cd $masterdir
 copyoverrides
 mklslar