Merge branch 'master' of ftpmaster's dak repository

Conflicts:

	ChangeLog

diff --combined ChangeLog
index cc6c1c8e8d721924b629c4537b398e2d56d2b56a,0f82968c6ec14f00594006b10080e585c76cd4d4..5448fb95f9610204153da8dc93dc34c2debdfe2d
--- 1/ChangeLog
--- 2/ChangeLog
+++ b/ChangeLog
@@@ -1,36 -1,17 +1,50 @@@
 +2008-08-28  Philipp Kern  <pkern@debian.org>
 +
 +      * daklib/utils.py (check_hashes): adapt to different API, check
 +      sizes separately
 +
 +      * daklib/utils.py (parse_changes, parse_deb822): refactor
 +      the string-based logic of parse_changes into a new function
 +      parse_deb822; parse_changes itself remains file-based
 +
 +      * daklib/utils.py (hash_key): gives the key of a hash in the
 +      files dict
 +
 +      * daklib/utils.py (create_hash, check_size): made more readable
 +
 +      * daklib/utils.py (check_hash): just check the hashes and complain
 +      about missing checksums
 +
 +      * daklib/utils.py (check_hash_fields): function to reject unknown
 +      checksums fields
 +
 +      * daklib/utils.py (_ensure_changes_hash, _ensure_dsc_hash): helper
 +      functions for ensure_hashes; check their corresponding manifests'
 +      hashes
 +
 +      * daklib/utils.py (ensure_hashes): retrieve the checksums fields
 +      from the original filecontents blob so that they do not need to
 +      be present in the .dak; refactored the actual checks by calling
 +      the aforementioned helper functions
 +
 +      * daklib/utils.py (parse_checksums): parse a given checksums field
 +      in a manifest and insert the values found into the files dict,
 +      checking the file sizes on the way
 +
+ 2008-09-06  Philipp Kern  <pkern@debian.org>
+ 
+       * dak/process_new.py (is_source_in_queue_dir): Access the right
+       variable to check if the given entry in the queue is the sourceful
+       upload we are looking for.
+ 
+ 2008-09-02  Joerg Jaspert  <joerg@debian.org>
+ 
+       * config/debian/pseudo-packages.description: Added debian-i18n and
+       buildd.emdebian.org
+ 
+       * dak/process_new.py (_accept): Fix Philipps new helper function
+       to not break by moving Upload.build_summaries there.
+ 
  2008-08-31  Philipp Kern  <pkern@debian.org>
  
        * dak/process_new.py (_accept): new helper function to accept
@@@ -69,24 -50,6 +83,24 @@@
        * config/debian/cron.dinstall: We dont want i18n to ever fail
        dinstall, add a || true
  
 +2008-08-15  Mark Hymers  <mhy@debian.org>
 +
 +      * daklib/utils.py: Actually import a module before using it.
 +
 +      * daklib/utils.py: Actually check we have basedict before trying to
 +      use it.
 +
 +      *  dak/process_accepted.py, dak/process_unchecked.py,
 +      daklib/database.py: Don't change get_files_id to use sha1sum and
 +      sha256sum.
 +
 +      * setup/init_pool.sql, dak/check_archive.py, dak/decode_dot_dak.py,
 +      dak/process_accepted.py, dak/process_unchecked.py, daklib/database.py,
 +      daklib/queue.py, daklib/utils.py: Attempt to add sha1sum and
 +      sha256sums into the database.  The complication is that we have to
 +      keep backwards compatibility with the .dak files already in existance.
 +      Note that import_archive hasn't been hacked to deal with this yet.
 +
  2008-08-14  Joerg Jaspert  <joerg@debian.org>
  
        * config/debian/cron.dinstall: Added the i18n retrieval of package
@@@ -150,6 -113,7 +164,6 @@@
  2008-08-07  Stephen Gran  <sgran@debian.org>
  
        * Drop use of exec to eval variable interpolation
 -
  2008-08-07  Joerg Jaspert  <joerg@debian.org>
  
        * dak/process_accepted.py (install): Error out with the new