From: Michael Casadevall <sonicmctails@gmail.com>
Date: Mon, 29 Dec 2008 19:23:07 +0000 (-0500)
Subject: Merge commit 'dak-master/master' into dm_upload_allowed
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d80d1f9473ed63a08404a23c04a9d8eabedc76a6;p=dak

Merge commit 'dak-master/master' into dm_upload_allowed

Conflicts:

	ChangeLog

Signed-off-by: Michael Casadevall <sonicmctails@gmail.com>
---

d80d1f9473ed63a08404a23c04a9d8eabedc76a6
diff --cc ChangeLog
index 7233547e,03a60f63..c3d4a6e2
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,29 -1,7 +1,30 @@@
+ 2008-12-28  Frank Lichtenheld  <djpig@debian.org>
+ 
+ 	* dak/override.py (main): Handle source-only packages better
+ 
 +2008-12-26  Michael Casadevall <sonicmctails@gmail.com>
 +
 +        * dak/import_keyring.py - Debrainized the projectb schema w.r.t. to DMs
 +                                  Now uses Debian-Maintainer column in uid tabl
 +
 +        * dak/import_ldap_fingerprints.py - Ditto
 +
 +        * dak/process_unchecked.py - Same
 +
 +        * scripts/debian/byhand-dm - See Above
 +
 +        * setup/init_pool.sql - More of the same
 +
- 
- 2008-12-26  Michael Casadevall <sonicmctails@gmail.com>
- 
 +        * dak/process_unchecked.py - Implemented new dm_upload_allowed field in source
 +
 +        * dak/process_unchecked.py - Fixed bug where dm-upload-allowed would not be respected
 +          in cases where only experimental had the DM-Upload-Allowed: yes flag.
 +
 +        * dak/process_accepted.py - Ditto, also causes new uploads to include uploaders
 +          table to properly include all uploads
 +
 +        * setup/init_pool.sql - Updated schema
 +
  2008-12-23  Michael Casadevall <sonicmctails@gmail.com>
  
          * dak/queue_report.py - Added 822 output format