Merge branch 'master' into dbtests

[dak.git] / config / debian-security / apt.conf.buildd

diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd
index 94d2aa3d79206aad57815d28f867bc8ae3acbe98..b16d0c97c137712646ef04ee90fd3c2b695a8763 100644 (file)
--- a/config/debian-security/apt.conf.buildd
+++ b/config/debian-security/apt.conf.buildd
@@ -1,51 +1,42 @@
+APT::FTPArchive::Contents off;
+
 Dir 
 {
-   ArchiveDir "/org/security.debian.org/buildd/";
-   OverrideDir "/org/security.debian.org/override/";
-   CacheDir "/org/security.debian.org/dak-database/";
+   ArchiveDir "/srv/security-master.debian.org/buildd/";
+   OverrideDir "/srv/security-master.debian.org/override/";
+   CacheDir "/srv/security-master.debian.org/dak-database/";
 };
 
 Default
 {
-   Packages::Compress ". gzip";
-   Sources::Compress ". gzip";
+   Packages::Compress ". gzip bzip2";
+   Sources::Compress ". gzip bzip2";
    DeLinkLimit 0;
    FileMode 0664;
 }
 
-bindirectory "etch"
+bindirectory "lenny"
 {
-   Packages "etch/Packages";
-   Sources "etch/Sources";
+   Packages "lenny/Packages";
+   Sources "lenny/Sources";
    Contents " ";
 
-   BinOverride "override.etch.all3";
-   BinCacheDB "packages-accepted-etch.db";
+   BinOverride "override.lenny.all3";
+   SrcOverride "override.lenny.all3.src";
+   BinCacheDB "packages-accepted-lenny.db";
    PathPrefix "";
    Packages::Extensions ".deb .udeb";
 };
 
-bindirectory "woody"
+bindirectory "squeeze"
 {
-   Packages "woody/Packages";
-   Sources "woody/Sources";
+   Packages "squeeze/Packages";
+   Sources "squeeze/Sources";
    Contents " ";
 
-   BinOverride "override.woody.all3";
-   BinCacheDB "packages-accepted-woody.db";
+   BinOverride "override.squeeze.all3";
+   SrcOverride "override.squeeze.all3.src";
+   BinCacheDB "packages-accepted-squeeze.db";
    PathPrefix "";
    Packages::Extensions ".deb .udeb";
 };
-
-bindirectory "sarge"
-{
-   Packages "sarge/Packages";
-   Sources "sarge/Sources";
-   Contents " ";
-
-   BinOverride "override.sarge.all3";
-   BinCacheDB "packages-accepted-sarge.db";
-   PathPrefix "";
-   Packages::Extensions ".deb .udeb";
-};
-