Merge changes from spohr.

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 929466c61ece3ba354a509ea68abcfe8632807f0..1cce754897bc0e7d993bdf0307f666739d0adb48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,16 @@
 2006-06-11  James Troup  <troup@spohr.debian.org>
 
+       * config/debian/cron.daily: invoke process-accepted not
+       process-unchecked.
+
+       * config/debian/vars (scriptsdir): new variable.
+       * config/debian/cron.daily: use it.
+
+       * 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.