X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=apt.conf;h=59a235591d77c9776ad072d06ab9527111a1c6c0;hb=c03d72b6ca4c9ae3942acf06c3e5322f93025f56;hp=214fd1ead71c564923e5052c6874a74434d8f0f0;hpb=46007f95da368217ca0bbdab3c4893157c6537e4;p=dak.git diff --git a/apt.conf b/apt.conf index 214fd1ea..59a23559 100644 --- a/apt.conf +++ b/apt.conf @@ -20,16 +20,6 @@ TreeDefault Contents::Header "/org/ftp.debian.org/katie/Contents.top"; }; -tree "dists/stable" -{ - FileList "/org/ftp.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list"; - SourceFileList "/org/ftp.debian.org/database/dists/stable_$(SECTION)_source.list"; - Sections "main contrib non-free"; - Architectures "alpha arm i386 m68k powerpc sparc source"; - BinOverride "override.potato.$(SECTION)"; - SrcOverride "override.potato.$(SECTION).src"; -}; - tree "dists/testing" { FileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list"; @@ -37,6 +27,7 @@ tree "dists/testing" Sections "main contrib non-free"; Architectures "alpha arm i386 m68k powerpc sparc source"; BinOverride "override.woody.$(SECTION)"; + ExtraOverride "override.woody.extra.$(SECTION)"; SrcOverride "override.woody.$(SECTION).src"; }; @@ -45,8 +36,9 @@ tree "dists/unstable" FileList "/org/ftp.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list"; SourceFileList "/org/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list"; Sections "main contrib non-free"; - Architectures "alpha arm hppa hurd-i386 i386 mips mipsel m68k powerpc sh sparc source"; + Architectures "alpha arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc source"; BinOverride "override.sid.$(SECTION)"; + ExtraOverride "override.sid.extra.$(SECTION)"; SrcOverride "override.sid.$(SECTION).src"; }; @@ -54,13 +46,24 @@ tree "dists/unstable/main" { FileList "/org/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; - Architectures "alpha arm hppa hurd-i386 i386 mips mipsel m68k powerpc sh sparc"; + Architectures "alpha arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc"; BinOverride "override.sid.main.$(SECTION)"; BinCacheDB "packages-debian-installer-$(ARCH).db"; Packages::Extensions ".udeb"; Contents " "; }; +tree "project/experimental" +{ + FileList "/org/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list"; + SourceFileList "/org/ftp.debian.org/database/dists/experimental_$(SECTION)_source.list"; + Sections "main contrib non-free"; + Architectures "alpha arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sh sparc source"; + BinOverride "override.sid.$(SECTION)"; + SrcOverride "override.sid.$(SECTION).src"; + Contents " "; +}; + bindirectory "dists/proposed-updates" {