Merge branch 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak

* 'master' of ssh://franck.debian.org/srv/ftp.debian.org/git/dak:
  config/debian/apache.conf-incoming: add buildd-squeeze-backports alias
  config/debian/dak.conf: no longer reject uploads to squeeze-backports

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/debian/apache.conf-incoming b/config/debian/apache.conf-incoming
index 7dae6e32d0caaa5f947aeeb3dcc57297ab80c073..d43f198cfae3a0d653b289cc0422acd4bda2f13e 100644 (file)
--- a/config/debian/apache.conf-incoming
+++ b/config/debian/apache.conf-incoming
@@ -27,6 +27,7 @@
   # New suite aliases
   Alias /buildd-unstable /srv/incoming.debian.org/dists/unstable/current/
   Alias /buildd-experimental /srv/incoming.debian.org/dists/experimental/current/
+  Alias /buildd-squeeze-backports /srv/incoming.debian.org/dists/squeeze-backports/current/
 
   <DirectoryMatch ~ "^/srv/(incoming\.debian\.org/(dists/|builddweb|debian-buildd/)|ftp\.debian\.org/mirror)">
     Order allow,deny

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 2ae072ae06e21026d2a86f39918860c7654f3a7a..41032c66e021dea622711dbf83fc9aa5afde15cd 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -217,7 +217,6 @@ Suite
 
 SuiteMappings
 {
- "reject squeeze-backports";
  "silent-map squeeze-security stable-security";
  "silent-map wheezy-security testing-security";
  "propup-version stable-security testing testing-proposed-updates unstable";