Merge upstream

diff --combined 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
@@@ -123,6 -163,20 +168,20 @@@
        changes[architecture] has source included.
        (check_transition): Now call the database.get_testing_version
  
+ 2008-02-09  Christoph Berg <myon@debian.org>
+ 
+       * daklib/queue.py (get_type): fubar does not exist in global
+       namespace.
+ 
+       * setup/add_constraints.sql setup/init_pool.sql: Add changedby column
+       to source table, and move src_uploaders after source so the REFERNCES
+       clause works.
+       * dak/process_accepted.py (install): Fill the changedby column from
+       the information found in the .changes. This will allow to identify
+       NMUs and sponsored uploads more precisely in tools querying projectb.
+       * scripts/debian/insert_missing_changedby.py: Script to import yet
+       missing fields from filippo's uploads-history DB.
+ 
  2008-02-06  Joerg Jaspert  <joerg@debian.org>
  
        * daklib/utils.py (check_signature): Make variable key available,

diff --combined dak/process_unchecked.py
index 0b8241e47a99cad82564bb0035c3b4c0bd403d96,055f7ee85b84d1d04e02dd6f905a64734818fe13..498eb49f0dd6a21da49cd2d76bb0e052c3efbf26
--- 1/dak/process_unchecked.py
--- 2/dak/process_unchecked.py
+++ b/dak/process_unchecked.py
@@@ -44,7 -44,6 +44,7 @@@ re_valid_pkg_name = re.compile(r"^[\dA-
  re_changelog_versions = re.compile(r"^\w[-+0-9a-z.]+ \([^\(\) \t]+\)")
  re_strip_revision = re.compile(r"-([^-]+)$")
  re_strip_srcver = re.compile(r"\s+\(\S+\)$")
 +re_spacestrip = re.compile('(\s)')
  
  ################################################################################
  
@@@ -462,16 -461,6 +462,16 @@@ def check_files()
              if depends == '':
                  reject("%s: Depends field is empty." % (file))
  
 +            # Sanity-check the Provides field
 +            provides = re_spacestrip.sub('', control.Find("Provides"))
 +            if provides == '':
 +                reject("%s: Provides field is empty." % (file))
 +            prov_list = provides.split(",")
 +            for prov in prov_list:
 +                if not re_valid_pkg_name.match(prov):
 +                    reject("%s: Invalid Provides field content %s." % (file, prov))
 +
 +
              # Check the section & priority match those given in the .changes (non-fatal)
              if control.Find("Section") and files[file]["section"] != "" and files[file]["section"] != control.Find("Section"):
                  reject("%s control file lists section as `%s', but changes file has `%s'." % (file, control.Find("Section", ""), files[file]["section"]), "Warning: ")
@@@ -1083,6 -1072,12 +1083,12 @@@ def check_signed_by_key()
          if uid_name == "": sponsored = 1
      else:
          sponsored = 1
+         if ("source" in changes["architecture"] and
+             daklib.utils.is_email_alias(uid_email)):
+             sponsor_addresses = daklib.utils.gpg_get_key_addresses(changes["fingerprint"])
+             if (changes["maintaineremail"] not in sponsor_addresses and
+                 changes["changedbyemail"] not in sponsor_addresses):
+                 changes["sponsoremail"] = uid_email
  
      if sponsored and not may_sponsor: 
          reject("%s is not authorised to sponsor uploads" % (uid))