Merge remote branch 'mhy/master'

config/backports/dak.conf

@@ -17,7 +17,6 @@ Dinstall
    // actions related to the package. For an example look at
    // packages.qa.debian.org
    // TrackingServer "packages.qa.test.backports.org";
-   LockFile "/srv/backports-master.debian.org/lock/dinstall.lock";
    // If defined this address gets a bcc of all mails.
    // FIXME: Einrichten wenn das hier produktiv geht!
    Bcc "debian-backports-changes@lists.debian.org";

config/debian-security/dak.conf

@@ -11,7 +11,6 @@ Dinstall
    MyDistribution "Debian"; // Used in emails
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
-   LockFile "/org/security-master.debian.org/dak/lock";
    Bcc "archive@ftp-master.debian.org";
    // GroupOverrideFilename "override.group-maint";
    FutureTimeTravelGrace 28800; // 8 hours

config/debian/dak.conf

@@ -11,7 +11,6 @@ Dinstall
    BugServer "bugs.debian.org";
    PackagesServer "packages.debian.org";
    TrackingServer "packages.qa.debian.org";
-   LockFile "/srv/ftp-master.debian.org/lock/dinstall.lock";
    Bcc "archive@ftp-master.debian.org";
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";

setup/dak-minimal.conf.template

@@ -28,8 +28,6 @@ Dinstall
    MyAdminAddress "dak@__DAKFQDN__";
    MyDistribution "TestDakInstance";
 
-   LockFile "__DAKBASE__/lock/dinstall.lock";
-
    FutureTimeTravelGrace 28800; // 8 hours
    PastCutoffYear "1984";
    SkipTime 10;

templates/missing-contents

-From: __DAK_ADDRESS__
-To: __TO_ADDRESS__
-X-Debian: DAK
-X-Debian-Package: __PACKAGE__
-MIME-Version: 1.0
-Content-Type: text/plain; charset="utf-8"
-Content-Transfer-Encoding: 8bit
-Subject: Missing contents for __PACKAGE__ in accepted queue
-
-While processing the accepted queue, I didn't have contents in the
-database for __PACKAGE__ version __VERSION__ for arch __ARCH__.  These
-contents should have been put into the database by process-unchecked
-when the package first arrived.
-
-This is probably stew's fault.