X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ChangeLog;h=40764f659d36b5e34f2946ac6f1a6db4b70bca91;hb=907deca03b25dc8ce65c89062ff3d7ca7a358976;hp=929466c61ece3ba354a509ea68abcfe8632807f0;hpb=ed1ddc2e20531d2c9de54c3fab6c075a912b615a;p=dak.git

diff --git a/ChangeLog b/ChangeLog
index 929466c6..40764f65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,48 @@
+2006-06-16  James Troup  <james@nocrew.org>
+
+	[Merged changes from klecker - original author unknown.]
+
+	* daklib/queue.py (Upload.dump_vars): also save changes["adv id"].
+
+	* dak/security_install.py (do_upload): fix check for oldstable and
+	upload file list handling.
+
+	* dak/process_unchecked.py (check_files): update "check for
+	source" code to also look in Embargoed and Unembargoed queues.
+	(is_unembargo): fix handling of Dir::Queue::Disembargo.
+
+	* dak/decode_dot_dak.py (main): add support for changes["adv id"].
+
+	* config/debian-security/vars (disembargo): add.
+
+	* config/debian-security/dak.conf (Dinstall::SigningKeyIds):
+	update.
+	(Process-Unchecked::AcceptedLockFile): add.
+	(Suite::Testing): clean up Version and Description.
+	(SuiteMappings): add silent map from etch-secure to testing.
+
+	* config/debian-security/cron.unchecked: add support for
+	disembargoed queues.
+
+	* config/debian-security/apt.conf.buildd: add bzip2ed Packages
+	files too.
+
+	* config/debian-security/apt.conf: add amd64 to architectures for
+	testing-security.
+
 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.