Merge commit 'sec-merge' into security

[dak.git] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 11ff452c17d5658573ff6bcd862374f09e642120..e515fc65edb362cd9401bc943d05d9a7c79cb452 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2008-05-04  Joerg Jaspert  <joerg@debian.org>
+
+       * dak/check_proposed_updates.py: Import stuff from daklib as
+       "import daklib.foo as foo"
+       * dak/clean_proposed_updates.py: likewise
+       * dak/clean_queues.py: likewise
+
+       * dak/check_archive.py (check_files_not_symlinks): Remove
+       long-time unused and commented code. Import stuff from daklib as
+       "import daklib.foo as foo"
+
+2008-05-04  Thomas Viehmann  <tv@beamnet.de>
+
+       * dak/process_unchecked.py (check_signed_by_key): cater for uid_email
+       None in sponsor notification
+
 2008-05-03  Joerg Jaspert  <joerg@debian.org>
 
        * dak/examine_package.py: clean up pychecker warnings (merged with
@@ -23,6 +39,7 @@
        * dak/stats.py: likewise
        * dak/symlink_dists.py: likewise
        * dak/transitions.py: likewise
+>>>>>>> sec-merge:ChangeLog
 
 2008-05-03  Joerg Jaspert  <joerg@debian.org>