Merge branch 'master' into dbtests

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

diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index 444e6804dd870e030edbb9489144e8057821ab63..456bfcb1f3cad26c3257c3af3152885eefe370c4 100644 (file)
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -9,26 +9,12 @@ Dir
 
 Default
 {
-   Packages::Compress ". gzip bzip2";
+   Packages::Compress "gzip bzip2";
    Sources::Compress "gzip bzip2";
    DeLinkLimit 0;
    FileMode 0664;
 }
 
-tree "dists/oldstable/updates"
-{
-   FileList "/srv/security-master.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/security-master.debian.org/dak-database/dists/oldstable_updates/$(SECTION)_source.list";
-   Sections "main contrib non-free";
-   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc source";
-   BinOverride "override.etch.$(SECTION)";
-   ExtraOverride "override.etch.extra.$(SECTION)";
-   SrcOverride "override.etch.$(SECTION).src";
-   Contents " ";
-   Packages::Compress "gzip bzip2";
-   Sources::Compress "gzip bzip2";
-};
-
 tree "dists/stable/updates"
 {
    FileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";