X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=cron.daily;h=8d3100162ab7a50fbccff75ddb283c4d9a4722a8;hb=a9d36073e85871bd2938b7ab74e2e09e9c40030d;hp=be42fa0d34c32e40d08d6482125bcf5bb4caad2c;hpb=e8eacb00ee41d7ab974ba913fff40e5c082b8e1a;p=dak.git

diff --git a/cron.daily b/cron.daily
index be42fa0d..8d310016 100755
--- a/cron.daily
+++ b/cron.daily
@@ -38,11 +38,6 @@ update-mirrorlists
 
 ################################################################################
 
-# temporary hack to work around the lack of an apt-utils & python-apt package
-export PYTHONPATH=$PYTHONPATH:/org/ftp.debian.org/scripts/apt/build/bin/
-export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/org/ftp.debian.org/scripts/apt/build/bin/
-export PATH=$PATH:/org/ftp.debian.org/scripts/apt/build/bin/
-
 cd $incoming
 rm -f REPORT
 katie -pak *.changes | direport | tee REPORT | \
@@ -55,18 +50,27 @@ symlinks -d -r $ftpdir
 
 cd $masterdir
 jenna
+
 # FIXME
 cd /org/ftp.debian.org/database/dists/
-for i in proposed-updates_-_binary-*; do cat $i >> proposed-updates_-_binary.list; done
+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
+denise
+# FIXME
+rm -f override.potato.all3
+for i in main contrib non-free; do cat override.potato.$i >> override.potato.all3; done
+
+# Generate Packages and Sources files
 cd $masterdir
 apt-ftparchive generate apt.conf
+
+# Clean out old packages
 rhona
-cd $indices
-charisma > .new-maintainers
-mv -f .new-maintainers Maintainers
-gzip -9v <Maintainers >.new-maintainers.gz
-mv -f .new-maintainers.gz Maintainers.gz
-cd $masterdir
+
+mkmaintainers
 copyoverrides
 mklslar
 mkchecksums