Merge upstream

diff --cc ChangeLog
index c6b4a9e2383ec0103382affb1e3c2fc7c2098acb,7666bdba6c0ede14d149e6b10c201145f03ca806..e227e68d5c65cc9c62b12c31ac7e1a02315111a8
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,8 -1,48 +1,53 @@@
+ 2008-04-25  Joerg Jaspert  <joerg@debian.org>
+ 
+       * dak/split_done.py (main): Only move files into their subdirs if
+       they are older than 30 days. That enables us to run this script as
+       part of a cronjob.
+ 
+       * config/debian/cron.weekly: Run dak split-done
+ 
+ 2008-04-23  Thomas Viehmann  <tviehmann@debian.org>
+ 
+       * dak/process_unchecked.py: add changes["sponsoremail"]
+         for sponsored uploads if desired
+       * daklib/queue.py: add changes["sponsoremail"] to
+         Subst["__MAINTAINER_TO__"] if present
+       * daklib/utils.py: add functions
+         is_email_alias to check which accounts allow email forwarding,
+         which_alias_file to find the alias file, and
+         gpg_get_key_addresses to find uid addresses for a given
+           fingerprint
+ 
+ 2008-04-22  Joerg Jaspert  <joerg@debian.org>
+ 
+       * setup/init_pool.sql: added a function/aggregate for the release
+       team to base some script on it.
+ 
+       * config/debian/cron.daily: push katie@merkel to immediately start
+       the sync of projectb there.
+ 
+ 2008-04-21  Joerg Jaspert  <joerg@debian.org>
+ 
+       * scripts/debian/expire_dumps: New script, expires old database
+       dumps, using a scheme to keep more of the recent dumps.
+ 
+       * config/debian/cron.daily: Use the new script. Also - compress
+       all files older than 7 days, instead of 30.
+ 
+       * dak/process_accepted.py (install): Do not break if a
+       source/maintainer combination is already in src_uploaders, "just"
+       warn us.
+ 
+ 2008-04-20  Thomas Viehmann  <tviehmann@debian.org>
+ 
+       * daklib/utils.py (build_file_list): Deal with "Format 3 style"
+       Format lines (ie. those having extra text appended).
+ 
 +2008-04-19  Joerg Jaspert  <joerg@debian.org>
 +
 +      * dak/process_unchecked.py (check_files): Sanity check the
 +      provides field, which closes #472783
 +
  2008-04-18  Joerg Jaspert  <joerg@debian.org>
  
        * config/debian/dak.conf: Add mapping stable-proposed-updates

diff --cc dak/process_unchecked.py
Simple merge