Merge remote branch 'ftpmaster/master'

diff --combined config/debian-security/dak.conf
index 11823b8e83ed595f7a886758e384e598eeeff74f,1cf71a26c7de85382168176c3eb26f91547fd86b..96fb97f9fa7632bd4a5a54759ee806994544de7b
--- 1/config/debian-security/dak.conf
--- 2/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@@ -20,6 -20,13 +20,6 @@@ Dinstal
     CloseBugs "false";
     OverrideDisparityCheck "false";
     BXANotify "false";
 -   QueueBuildSuites
 -   {
 -     stable;
 -     testing;
 -   };
 -   SecurityQueueHandling "true";     
 -   SecurityQueueBuild "true";     
     DefaultSuite "stable";
     SuiteSuffix "updates/";
     OverrideMaintainer "dak@security.debian.org";
@@@ -51,14 -58,6 +51,6 @@@ Queue-Repor
    };
  };
  
- Import-Keyring
- {
-   /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
-     {
-       Debian-Maintainer "true";
-     };
- };
- 
  Import-LDAP-Fingerprints
  {
    LDAPDn "ou=users,dc=debian,dc=org";
@@@ -113,6 -112,7 +105,6 @@@ Clean-Suite
  {
    // How long (in seconds) dead packages are left before being killed
    StayOfExecution 129600; // 1.5 days
 -  QueueBuildStayOfExecution 86400; // 24 hours
    MorgueSubDir "pool";
    OverrideFilename "override.source-only";
  };
@@@ -214,6 -214,7 +206,6 @@@ Di
    Export "/srv/security-master.debian.org/export/";
    Dak "/srv/security-master.debian.org/dak/";
    Templates "/srv/security-master.debian.org/dak/templates/";
 -  PoolRoot "pool/";
    Override "/srv/security-master.debian.org/override/";
    Lock "/srv/security-master.debian.org/lock/";
    Cache "/srv/security-master.debian.org/database/";
@@@ -221,14 -222,14 +213,14 @@@
    Log "/srv/security-master.debian.org/dak-log/";
    Morgue "/srv/security-master.debian.org/morgue/";
    Override "/srv/security-master.debian.org/scripts/override/";
 -  QueueBuild "/srv/security-master.debian.org/buildd/";
    Upload "/srv/queued/ftpmaster/";
    TempPath "/srv/security-master.debian.org/tmp";
 +  Holding "/srv/security-master.debian.org/queue/holding/";
 +  Done "/srv/security-master.debian.org/queue/done/";
 +
    Queue
    {
      Byhand "/srv/security-master.debian.org/queue/byhand/";
 -    Done "/srv/security-master.debian.org/queue/done/";
 -    Holding "/srv/security-master.debian.org/queue/holding/";
      New "/srv/security-master.debian.org/queue/new/";
      Reject "/srv/security-master.debian.org/queue/reject/";
      Unchecked "/srv/security-master.debian.org/queue/unchecked/";

diff --combined config/debian/dak.conf
index 721950b9fa765c930fe54c53647b8eecae78621c,8b1b43220b4b9600a15f352462defbb94f4fc328..24f662e113b25b818ccda92016acd193fe42fdee
--- 1/config/debian/dak.conf
--- 2/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@@ -21,7 -21,10 +21,7 @@@ Dinstal
     OverrideDisparityCheck "true";
     DefaultSuite "unstable";
     LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
 -   Reject
 -   {
 -     ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
 -   };
 +   ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
     // if you setup an own dak repository and want to upload Debian packages you most possibly want
     // to set the following option to a real path/filename and then enter those mail addresses that
     // you want to be able to receive mails generated by your dak installation. This avoids spamming
@@@ -95,19 -98,6 +95,6 @@@ R
     Bcc "removed-packages@qa.debian.org";
  };
  
- Import-Archive
- {
-   ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/";
- };
- 
- Import-Keyring
- {
-   /srv/keyring.debian.org/keyrings/debian-maintainers.gpg
-     {
-       Debian-Maintainer "true";
-     };
- };
- 
  Import-LDAP-Fingerprints
  {
    LDAPDn "ou=users,dc=debian,dc=org";
@@@ -316,6 -306,7 +303,6 @@@ Di
    Pool "/srv/ftp-master.debian.org/ftp/pool/";
    Templates "/srv/ftp-master.debian.org/dak/templates/";
    Export "/srv/ftp-master.debian.org/export/";
 -  PoolRoot "pool/";
    Lists "/srv/ftp-master.debian.org/database/dists/";
    Cache "/srv/ftp-master.debian.org/database/";
    Log "/srv/ftp-master.debian.org/log/";
@@@ -324,20 -315,19 +311,20 @@@
    Override "/srv/ftp-master.debian.org/scripts/override/";
    UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
    TempPath "/srv/ftp-master.debian.org/tmp/";
 +  BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
 +  Holding "/srv/ftp-master.debian.org/queue/holding/";
 +  Done "/srv/ftp-master.debian.org/queue/done/";
 +
    Queue
    {
      Byhand "/srv/ftp-master.debian.org/queue/byhand/";
      ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
      OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
      ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
 -    Done "/srv/ftp-master.debian.org/queue/done/";
 -    Holding "/srv/ftp-master.debian.org/queue/holding/";
      New "/srv/ftp-master.debian.org/queue/new/";
      Reject "/srv/ftp-master.debian.org/queue/reject/";
      Unchecked "/srv/ftp-master.debian.org/queue/unchecked/";
      Newstage "/srv/ftp-master.debian.org/queue/newstage/";
 -    BTSVersionTrack "/srv/ftp-master.debian.org/queue/bts_version_track/";
      Embargoed "/srv/ftp-master.debian.org/does/not/exist/";
      Unembargoed "/srv/ftp-master.debian.org/does/not/exist/";
      Disembargo "/srv/ftp-master.debian.org/does/not/exist/";