From: James Troup Date: Sun, 21 May 2006 00:00:26 +0000 (-0500) Subject: Add amd64 to >= testing. Drop sh from experimental. Move experimental to dists... X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=fdd98658d25864e73f0cf62c97b8cf8a3c90a07b;p=dak Add amd64 to >= testing. Drop sh from experimental. Move experimental to dists/. Drop uncompressed Packages files for testing. [ajt] Add udeb tree for proposed-updates [troup] --- diff --git a/config/debian/apt.conf b/config/debian/apt.conf index c5d96270..300d559d 100644 --- a/config/debian/apt.conf +++ b/config/debian/apt.conf @@ -38,11 +38,11 @@ tree "dists/testing" FileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list"; SourceFileList "/org/ftp.debian.org/database/dists/testing_$(SECTION)_source.list"; Sections "main contrib non-free"; - Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; + Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; BinOverride "override.etch.$(SECTION)"; ExtraOverride "override.etch.extra.$(SECTION)"; SrcOverride "override.etch.$(SECTION).src"; - Packages::Compress ". gzip bzip2"; + Packages::Compress "gzip bzip2"; Sources::Compress "gzip bzip2"; }; @@ -51,7 +51,7 @@ tree "dists/testing-proposed-updates" FileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list"; SourceFileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list"; Sections "main contrib non-free"; - Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; + Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc source"; BinOverride "override.etch.$(SECTION)"; ExtraOverride "override.etch.extra.$(SECTION)"; SrcOverride "override.etch.$(SECTION).src"; @@ -63,7 +63,7 @@ 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 ia64 mips mipsel m68k powerpc s390 sh sparc source"; + Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source"; BinOverride "override.sid.$(SECTION)"; ExtraOverride "override.sid.extra.$(SECTION)"; SrcOverride "override.sid.$(SECTION).src"; @@ -73,11 +73,23 @@ tree "dists/unstable" // debian-installer +tree "dists/proposed-updates/main" +{ + FileList "/org/ftp.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list"; + Sections "debian-installer"; + Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; + BinOverride "override.sarge.main.$(SECTION)"; + SrcOverride "override.sarge.main.src"; + BinCacheDB "packages-debian-installer-$(ARCH).db"; + Packages::Extensions ".udeb"; + Contents " "; +}; + tree "dists/testing/main" { FileList "/org/ftp.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; - Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; + Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; BinOverride "override.etch.main.$(SECTION)"; SrcOverride "override.etch.main.src"; BinCacheDB "packages-debian-installer-$(ARCH).db"; @@ -89,7 +101,7 @@ tree "dists/testing-proposed-updates/main" { FileList "/org/ftp.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list"; Sections "debian-installer"; - Architectures "alpha arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; + Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"; BinOverride "override.etch.main.$(SECTION)"; SrcOverride "override.etch.main.src"; BinCacheDB "packages-debian-installer-$(ARCH).db"; @@ -101,22 +113,22 @@ 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 ia64 mips mipsel m68k powerpc s390 sh sparc"; + Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc"; BinOverride "override.sid.main.$(SECTION)"; SrcOverride "override.sid.main.src"; BinCacheDB "packages-debian-installer-$(ARCH).db"; Packages::Extensions ".udeb"; - Contents "Contents $(DIST)/../Contents-udeb"; + Contents "$(DIST)/../Contents-udeb"; }; // Experimental -tree "project/experimental" +tree "dists/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"; + Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc source"; BinOverride "override.sid.$(SECTION)"; SrcOverride "override.sid.$(SECTION).src"; Contents " ";