From: Mark Hymers <mhy@debian.org>
Date: Sun, 15 Mar 2009 17:35:28 +0000 (+0000)
Subject: Merge branch 'master' into merge
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=c0462dd57e958b696496bfa96de4cbaa8ffc28f1;hp=955ee64ea41bb7afb1c6a64d256c4bfc7f834cd9;p=dak.git

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 ade76eef..a57efc8d 100644
--- 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 cc2db8ad..1f0e1961 100755
--- 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 d9e00993..184280b8 100755
--- 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 a71c89db..4004c5b0 100644
--- 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