X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ChangeLog;h=47e22b138caf887f804ca7adafc00c9506d0a03a;hb=ceba4993a87c1b416a01c814e37c3277775961bb;hp=f84478160ad8f20026cf6698b50a022c40e5c277;hpb=1955704e1679c2061856a241f205efca4796f799;p=dak.git

diff --git a/ChangeLog b/ChangeLog
index f8447816..47e22b13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,16 @@
+2006-06-11  James Troup  <troup@spohr.debian.org>
+
+	* 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.
+
 2006-06-11  James Troup  <james@nocrew.org>
 
 	* dak/override.py (main): temporarily add content of old X-Katie