X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=ChangeLog;h=89cbd8ca04808573dc5fa9d882d8861f9f47646d;hb=fb3d44c5e9b4a010f56cffd8fd5e35d6221805f9;hp=81a009f49a0d1518d2b2ee04f421a2c1dd98c08e;hpb=2286ce0734fe5dadf2b601165f56d2ebb5a91a5a;p=dak.git

diff --git a/ChangeLog b/ChangeLog
index 81a009f4..89cbd8ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,29 @@
+2005-11-26  Anthony Towns  <aj@erisian.com.au>
+
+	* Merge of changes from klecker, by various people
+
+	* amber: special casing for not passing on amd64 and oldstable updates
+	* amber: security mirror triggering
+	* templates/amber.advisory: updated advisory structure
+	* apt.conf.buildd-security: update for sarge's release
+	* apt.conf-security: update for sarge's release
+	* cron.buildd-security: generalise suite support, update for sarge's release
+	* cron.daily-security: update for sarge's release, add udeb support
+	* vars-security: update for sarge's release
+	* katie.conf-security: update for sarge's release, add amd64 support,
+	update signing key
+
+	* docs/README.names, docs/README.quotes: include the additions
+
 2005-11-25  Anthony Towns  <aj@erisian.com.au>
 
 	* Changed accepted_autobuild to queue_build everywhere.
 	* Add a queue table.
 	* Add a "queue" field in the queue_build table (currently always 0)
 
+	* jennifer: Restructure to make it easier to support special
+	purpose queues between unchecked and accepted.
+
 2005-11-25  Anthony Towns  <aj@erisian.com.au>
 
 	* Finishing merge of changes from spohr, by various people still