From: Joerg Jaspert <joerg@debian.org>
Date: Mon, 16 Aug 2010 20:56:59 +0000 (+0200)
Subject: Merge branch 'master' into bpo
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=0872b2e0b78670c91fd2bf0bda52e5761e079820;hp=181bf8b9e7a0ad6960e1e7bd79335355ace50594;p=dak.git

Merge branch 'master' into bpo

* master: (1277 commits)
  rm.py: also take udebs into account while checking rdeps
  Indent reason
  add indentation to reason for 822 format
  Some code cleanups
  config/debian/apache.conf-incoming: add vitry and krenek
  cron.hourly: generate removals-full.822
  rm.py: implement rfc822 removal format
  queue.py: fix more error handling code
  queue.py: fix error handling code
  rm822.py script to convert removals log into rfc822 format
  Add more buildds
  config/debian/apache.conf-incoming: cleanup a bit
  config/debian/apache.conf-incoming: add new armel buildds
  [mhy] Remove malo and add poulenc/porpora
  Add the web-users dir and a rewriterule for it
  We can't allow unchecked until we've hardlinked the mirrors now that we're doing apt-ftparchive as part of it
  Run without -i
  Timestamps
  generate-filelist: create fewer DB sessions
  run g-p-s in unchecked
  ...
---

diff --git a/config/backports.org/cron.buildd b/config/backports.org/cron.buildd
index f48f98f0..218ee884 100755
--- a/config/backports.org/cron.buildd
+++ b/config/backports.org/cron.buildd
@@ -6,5 +6,6 @@
 
 export SCRIPTVARS=/org/backports.org/dak-config/vars
 . $SCRIPTVARS
-ssh -i $base/s3kr1t/dot-ssh/id_rsa wanna-build@wanna-build.farm.ftbfs.de echo broken
+#ssh -i $base/s3kr1t/dot-ssh/id_rsa wanna-build@wanna-build.farm.ftbfs.de echo broken
+ssh -i $base/s3kr1t/dot-ssh/id_rsa wbadm@buildd.debian.org echo broken
 exit 0
diff --git a/config/backports.org/cron.hourly b/config/backports.org/cron.hourly
index b5e06462..a43c62c1 100755
--- a/config/backports.org/cron.hourly
+++ b/config/backports.org/cron.hourly
@@ -67,6 +67,8 @@ dak generate-index-diffs
 # Generate Release files
 dak generate-releases
 
+dak make-pkg-file-mapping | bzip2 -9 > $base/ftp/indices/package-file.map.bz2
+
 # Clean out old packages
 # Now in cron.daily. JJ[03.05.2005.]
 #rhona