merge Jeroen's lisa_existing_sources_first_and_mtime patch

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index dfc63f89cd16ae59ce5d6f34b3aa03b0a7cdb94d..dd27ec63fdd1d8158d4d4157fab2cbe41da2d3ed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,16 @@
+2008-07-26  Joerg Jaspert  <joerg@debian.org>
+
+       * templates/reject-proposed-updates.rejected,dak/reject_proposed_updates.py:
+       applied a patch by luk modifying the stable rejection mails to fit
+       reality a bit more
+
+       * config/debian/dak.conf: no m68k in testing, so no m68k in t-p-u
+       r4 now
+
 2008-06-19  Thomas Viehmann  <tv@beamnet.de>
 
-       * dak/process_unchecked.py (check_dsc): Catch UnknownFormatError
-       and reject
+       * dak/process_unchecked.py (check_dsc,check_hashes): Catch
+       UnknownFormatError and reject
 
 2008-06-15  Joerg Jaspert  <joerg@debian.org>