Merge branch 'master' into merge

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index ade76eef359203e904d2ff1ce9ed077ed7fc3ce8..a57efc8d689fe897fa06b8c9408a58109eb5d788 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -339,6 +339,8 @@ Section
   vcs;
   video;
   x11;
+  xfce;
+  zope;
 };
 
 Priority

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index cc2db8adcc0f7985dc6d3d22980b6a48404059a2..1f0e1961a86f8113b3de2788f1bdff754b62d9f6 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -222,7 +222,7 @@ function release() {
 
 function dakcleanup() {
     log "Cleanup old packages/files"
-    dak clean-suites
+    dak clean-suites -m 10000
     dak clean-queues
 }
 

diff --git a/config/debian/cron.monthly b/config/debian/cron.monthly
index d9e00993042edae9ee59f67f5a8f690032620ebf..184280b8c702ea872bca518b55329738143d52c0 100755 (executable)
--- a/config/debian/cron.monthly
+++ b/config/debian/cron.monthly
@@ -15,6 +15,9 @@ cd /srv/ftp.debian.org/mail/archive
 for m in mail bxamail; do
     if [ -f $m ]; then
         mv $m ${m}-$DATE
+        touch ${m}
+        chown dak:ftpteam ${m}
+        chmod 660 ${m}
         sleep 20
         gzip -9 ${m}-$DATE
         chgrp $ftpgroup ${m}-$DATE.gz

diff --git a/docs/README.quotes b/docs/README.quotes
index a71c89dbaa5d69b40de723388b4e855b62abb715..4004c5b01605125d401ec7b62d98b83cec12bf85 100644 (file)
--- a/docs/README.quotes
+++ b/docs/README.quotes
@@ -345,3 +345,4 @@ Canadians: This is a lighthouse. Your call.
 
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
+<mhy> oh no, Ganneff has just corrected my english