Merge branch 'master' into franck

* master:
  No more pgp keyring

diff --combined config/debian/dak.conf
index c0a902c400ba29b24d67e139b762390807471561,2610da38dc94d9a3c697e380746d4a66fb5e3d5b..328d5811b176b9483ef802f904856b4aa32ab6bc
--- 1/config/debian/dak.conf
--- 2/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@@ -2,11 -2,10 +2,10 @@@ Dinstal
  {
     GPGKeyring {
        "/srv/keyring.debian.org/keyrings/debian-keyring.gpg";
-       "/srv/keyring.debian.org/keyrings/debian-keyring.pgp";
        "/srv/keyring.debian.org/keyrings/debian-maintainers.gpg";
     };
 -   SigningKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg";
 -   SigningPubKeyring "/srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
 +   SigningKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg";
 +   SigningPubKeyring "/srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg";
     SigningKeyIds "55BE302B";
  //   SendmailCommand "/usr/sbin/sendmail -odq -oi -t -f envelope@ftp-master.debian.org";
     SendmailCommand "/usr/sbin/sendmail -oi -t -f envelope@ftp-master.debian.org";
@@@ -17,7 -16,7 +16,7 @@@
     BugServer "bugs.debian.org";
     PackagesServer "packages.debian.org";
     TrackingServer "packages.qa.debian.org";
 -   LockFile "/srv/ftp.debian.org/lock/dinstall.lock";
 +   LockFile "/srv/ftp-master.debian.org/lock/dinstall.lock";
     Bcc "archive@ftp-master.debian.org";
     FutureTimeTravelGrace 28800; // 8 hours
     PastCutoffYear "1984";
@@@ -26,7 -25,7 +25,7 @@@
     CloseBugs "true";
     OverrideDisparityCheck "true";
     DefaultSuite "unstable";
 -   LintianTags "/srv/ftp.debian.org/dak/config/debian/lintian.tags";
 +   LintianTags "/srv/ftp-master.debian.org/dak/config/debian/lintian.tags";
     QueueBuildSuites
     {
       unstable;
@@@ -34,7 -33,7 +33,7 @@@
     Reject
     {
       NoSourceOnly "true";
 -     ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
 +     ReleaseTransitions "/srv/ftp-master.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
@@@ -55,7 -54,7 +54,7 @@@ Generate-Index-Diff
  {
     Options
     {
 -     TempDir "/srv/ftp.debian.org/tiffani";
 +     TempDir "/srv/ftp-master.debian.org/tiffani";
       MaxDiffs { Default 14; };
     };
  };
@@@ -67,9 -66,9 +66,9 @@@ Overrid
  
  Mirror-Split
  {
 -  FTPPath "/srv/ftp.debian.org/ftp";
 -  TreeRootPath "/srv/ftp.debian.org/scratch/dsilvers/treeroots";
 -  TreeDatabasePath "/srv/ftp.debian.org/scratch/dsilvers/treedbs";
 +  FTPPath "/srv/ftp-master.debian.org/ftp";
 +  TreeRootPath "/srv/ftp-master.debian.org/scratch/dsilvers/treeroots";
 +  TreeDatabasePath "/srv/ftp-master.debian.org/scratch/dsilvers/treedbs";
    BasicTrees { alpha; arm; hppa; hurd-i386; i386; ia64; mips; mipsel; powerpc; s390; sparc; m68k };
    CombinationTrees
    {
@@@ -81,12 -80,12 +80,12 @@@
  
  Show-New
  {
 -  HTMLPath "/srv/ftp.debian.org/web/new/";
 +  HTMLPath "/srv/ftp-master.debian.org/web/new/";
  }
  
  Show-Deferred
  {
 -  LinkPath "/srv/ftp.debian.org/web/deferred/";
 +  LinkPath "/srv/ftp-master.debian.org/web/deferred/";
    DeferredQueue "/srv/queued/DEFERRED/";
  }
  
@@@ -126,13 -125,13 +125,13 @@@ R
     };
  
     MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
 -   LogFile "/srv/ftp.debian.org/web/removals.txt";
 +   LogFile "/srv/ftp-master.debian.org/web/removals.txt";
     Bcc "removed-packages@qa.debian.org";
  };
  
  Import-Archive
  {
 -  ExportDir "/srv/ftp.debian.org/dak/import-archive-files/";
 +  ExportDir "/srv/ftp-master.debian.org/dak/import-archive-files/";
  };
  
  Import-Keyring
@@@ -173,8 -172,8 +172,8 @@@ Clean-Suite
  
  Process-New
  {
 -  DinstallLockFile "/srv/ftp.debian.org/lock/processnew.lock";
 -  LockDir "/srv/ftp.debian.org/lock/new/";
 +  DinstallLockFile "/srv/ftp-master.debian.org/lock/processnew.lock";
 +  LockDir "/srv/ftp-master.debian.org/lock/new/";
  };
  
  Check-Overrides
@@@ -234,8 -233,8 +233,8 @@@ Suit
        };
        Announce "debian-changes@lists.debian.org";
        CopyChanges "dists/proposed-updates/";
 -      CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
 -      CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/";
 +      CopyDotDak "/srv/ftp-master.debian.org/queue/proposed-updates/";
 +      CommentsDir "/srv/ftp-master.debian.org/queue/p-u-new/COMMENTS/";
        Version "5.0-updates";
        Origin "Debian";
        Description "Debian 5.0 Proposed Updates - Not Released";
@@@ -432,51 -431,51 +431,51 @@@ AutomaticByHandPackages 
      Source "debian-installer";
      Section "raw-installer";
      Extension "tar.gz";
 -    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-di";
 +    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-di";
    };
  
    "tag-overrides" {
      Source "tag-overrides";
      Section "byhand";
      Extension "tar.gz";
 -    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-tag";
 +    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-tag";
    };
  
    "task-overrides" {
      Source "tasksel";
      Section "byhand";
      Extension "tar.gz";
 -    Script "/srv/ftp.debian.org/dak/scripts/debian/byhand-task";
 +    Script "/srv/ftp-master.debian.org/dak/scripts/debian/byhand-task";
    };
  };
  
  Dir
  {
 -  Root "/srv/ftp.debian.org/ftp/";
 -  Pool "/srv/ftp.debian.org/ftp/pool/";
 -  Templates "/srv/ftp.debian.org/dak/templates/";
 +  Root "/srv/ftp-master.debian.org/ftp/";
 +  Pool "/srv/ftp-master.debian.org/ftp/pool/";
 +  Templates "/srv/ftp-master.debian.org/dak/templates/";
    PoolRoot "pool/";
 -  Lists "/srv/ftp.debian.org/database/dists/";
 -  Log "/srv/ftp.debian.org/log/";
 -  Lock "/srv/ftp.debian.org/lock";
 -  Morgue "/srv/ftp.debian.org/morgue/";
 +  Lists "/srv/ftp-master.debian.org/database/dists/";
 +  Log "/srv/ftp-master.debian.org/log/";
 +  Lock "/srv/ftp-master.debian.org/lock";
 +  Morgue "/srv/ftp-master.debian.org/morgue/";
    MorgueReject "reject";
 -  Override "/srv/ftp.debian.org/scripts/override/";
 +  Override "/srv/ftp-master.debian.org/scripts/override/";
    QueueBuild "/srv/incoming.debian.org/buildd/";
    UrgencyLog "/srv/release.debian.org/britney/input/urgencies/";
 -  TempPath "/srv/ftp.debian.org/tmp/";
 +  TempPath "/srv/ftp-master.debian.org/tmp/";
    Queue
    {
 -    Byhand "/srv/ftp.debian.org/queue/byhand/";
 -    ProposedUpdates "/srv/ftp.debian.org/queue/p-u-new/";
 -    OldProposedUpdates "/srv/ftp.debian.org/queue/o-p-u-new/";
 -    Done "/srv/ftp.debian.org/queue/done/";
 -    Holding "/srv/ftp.debian.org/queue/holding/";
 -    New "/srv/ftp.debian.org/queue/new/";
 -    Reject "/srv/ftp.debian.org/queue/reject/";
 -    Unchecked "/srv/ftp.debian.org/queue/unchecked/";
 -    Newstage "/srv/ftp.debian.org/queue/newstage/";
 -    BTSVersionTrack "/srv/ftp.debian.org/queue/bts_version_track/";
 +    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/";
 +    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 "/does/not/exist/";
      Unembargoed "/does/not/exist/";
      Disembargo "/does/not/exist/";
@@@ -487,7 -486,7 +486,7 @@@ Queue-Repor
  {
    ReportLocations
    {
 -    822Location "/srv/ftp.debian.org/web/new.822";
 +    822Location "/srv/ftp-master.debian.org/web/new.822";
    };
  };
  
@@@ -628,7 -627,7 +627,7 @@@ Locatio
  {
  
    // Pool locations on ftp-master.debian.org
 -  /srv/ftp.debian.org/ftp/pool/
 +  /srv/ftp-master.debian.org/ftp/pool/
      {
        Archive "ftp-master";
        Type "pool";
@@@ -652,5 -651,5 +651,5 @@@ Urgenc
  Contents
  {
    Header "contents";
 -  Root "/srv/ftp.debian.org/test/";
 +  Root "/srv/ftp-master.debian.org/test/";
  }