X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fapt.conf;h=9822577a277664c4d1f2f4d108cf3e04578efc95;hb=f0bfd37e7286156598d79b53501ebe2000bb7924;hp=733e6025bc50a25a564714fa6efa150147f1a6b7;hpb=c86e84d01030e379629c331e15e78876633bbce1;p=dak.git

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 733e6025..9822577a 100644
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -44,30 +44,6 @@ tree "dists/proposed-updates"
    Contents " ";
 };
 
-tree "/srv/ftp-master.debian.org/ftp-testing/dists/lenny-volatile"
-{
-   FileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile_$(SECTION)_source.list";
-   Sections "main contrib non-free";
-   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
-   BinOverride "override.lenny.$(SECTION)";
-   ExtraOverride "override.lenny.extra.$(SECTION)";
-   SrcOverride "override.lenny.$(SECTION).src";
-   Contents " ";
-};
-
-tree "/srv/ftp-master.debian.org/ftp-testing/dists/lenny-volatile-proposed-updates"
-{
-   FileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile-proposed-updates_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile-proposed-updates_$(SECTION)_source.list";
-   Sections "main contrib non-free";
-   Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
-   BinOverride "override.lenny.$(SECTION)";
-   ExtraOverride "override.lenny.extra.$(SECTION)";
-   SrcOverride "override.lenny.$(SECTION).src";
-   Contents " ";
-};
-
 tree "dists/testing"
 {
    FakeDI "dists/unstable";
@@ -92,7 +68,7 @@ tree "dists/testing-proposed-updates"
    Contents " ";
 };
 
-tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile"
+tree "dists/squeeze-volatile"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_binary-$(ARCH).list";
    SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_source.list";
@@ -104,18 +80,6 @@ tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile"
    Contents " ";
 };
 
-tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile-proposed-updates"
-{
-   FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile-proposed-updates_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile-proposed-updates_$(SECTION)_source.list";
-   Sections "main contrib non-free";
-   Architectures "amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
-   BinOverride "override.squeeze.$(SECTION)";
-   ExtraOverride "override.squeeze.extra.$(SECTION)";
-   SrcOverride "override.squeeze.$(SECTION).src";
-   Contents " ";
-};
-
 tree "dists/unstable"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list";