提交 be43b702 编写于 作者: M Mark Hymers

First pass at lenny release branch

Things we do:
 * Move etch to oldstable
 * Rename lenny to stable
 * Create squeeze as testing
 * Make sure that all stable references now have arm and armel
 * Make sure that all testing/unstable/experimental references only have armel
   (i.e. drop arm)
Signed-off-by: NMark Hymers <mhy@debian.org>
上级 eb2da389
......@@ -20,10 +20,10 @@ TreeDefault
Contents::Header "/srv/ftp.debian.org/dak/config/debian/Contents.top";
};
tree "dists/proposed-updates"
tree "dists/oldstable-proposed-updates"
{
FileList "/srv/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_source.list";
FileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-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)";
......@@ -32,16 +32,28 @@ tree "dists/proposed-updates"
Contents " ";
};
tree "dists/testing"
tree "dists/proposed-updates"
{
FakeDI "dists/unstable";
FileList "/srv/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp.debian.org/database/dists/testing_$(SECTION)_source.list";
FileList "/srv/ftp.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp.debian.org/database/dists/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";
FileList "/srv/ftp.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp.debian.org/database/dists/testing_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
BinOverride "override.squeeze.$(SECTION)";
ExtraOverride "override.squeeze.extra.$(SECTION)";
SrcOverride "override.squeeze.$(SECTION).src";
};
tree "dists/testing-proposed-updates"
......@@ -49,10 +61,10 @@ tree "dists/testing-proposed-updates"
FileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp.debian.org/database/dists/testing-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";
Architectures "alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
BinOverride "override.squeeze.$(SECTION)";
ExtraOverride "override.squeeze.extra.$(SECTION)";
SrcOverride "override.squeeze.$(SECTION).src";
Contents " ";
};
......@@ -61,7 +73,7 @@ tree "dists/unstable"
FileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp.debian.org/database/dists/unstable_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
BinOverride "override.sid.$(SECTION)";
ExtraOverride "override.sid.extra.$(SECTION)";
SrcOverride "override.sid.$(SECTION).src";
......@@ -69,9 +81,9 @@ tree "dists/unstable"
// debian-installer
tree "dists/proposed-updates/main"
tree "dists/oldstable-proposed-updates/main"
{
FileList "/srv/ftp.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
FileList "/srv/ftp.debian.org/database/dists/oldstable-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.etch.main.$(SECTION)";
......@@ -81,15 +93,27 @@ tree "dists/proposed-updates/main"
Contents " ";
};
tree "dists/testing/main"
tree "dists/proposed-updates/main"
{
FileList "/srv/ftp.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
FileList "/srv/ftp.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.lenny.main.$(SECTION)";
SrcOverride "override.lenny.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents " ";
};
tree "dists/testing/main"
{
FileList "/srv/ftp.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.squeeze.main.$(SECTION)";
SrcOverride "override.squeeze.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents "$(DIST)/../Contents-udeb";
};
......@@ -97,9 +121,9 @@ tree "dists/testing/non-free"
{
FileList "/srv/ftp.debian.org/database/dists/testing_non-free_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.lenny.main.$(SECTION)";
SrcOverride "override.lenny.main.src";
Architectures "alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.squeeze.main.$(SECTION)";
SrcOverride "override.squeeze.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents "$(DIST)/../Contents-udeb-nf";
......@@ -109,9 +133,9 @@ tree "dists/testing-proposed-updates/main"
{
FileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.lenny.main.$(SECTION)";
SrcOverride "override.lenny.main.src";
Architectures "alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.squeeze.main.$(SECTION)";
SrcOverride "override.squeeze.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents " ";
......@@ -121,7 +145,7 @@ tree "dists/unstable/main"
{
FileList "/srv/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc";
Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.sid.main.$(SECTION)";
SrcOverride "override.sid.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
......@@ -133,7 +157,7 @@ tree "dists/unstable/non-free"
{
FileList "/srv/ftp.debian.org/database/dists/unstable_non-free_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc";
Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.sid.main.$(SECTION)";
SrcOverride "override.sid.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
......@@ -145,7 +169,7 @@ tree "dists/experimental/main"
{
FileList "/srv/ftp.debian.org/database/dists/experimental_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
Architectures "alpha amd64 armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.sid.main.$(SECTION)";
SrcOverride "override.sid.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
......@@ -157,7 +181,7 @@ tree "dists/experimental/non-free"
{
FileList "/srv/ftp.debian.org/database/dists/experimental_non-free_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc";
Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.sid.main.$(SECTION)";
SrcOverride "override.sid.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
......@@ -172,7 +196,7 @@ tree "dists/experimental"
FileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp.debian.org/database/dists/experimental_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
Architectures "alpha amd64 armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
BinOverride "override.sid.$(SECTION)";
SrcOverride "override.sid.$(SECTION).src";
};
......
Dir
{
ArchiveDir "/srv/ftp.debian.org/ftp/";
OverrideDir "/srv/ftp.debian.org/scripts/override/";
CacheDir "/srv/ftp.debian.org/database/";
};
Default
{
Packages::Compress "gzip bzip2";
Sources::Compress "gzip bzip2";
Contents::Compress "gzip";
DeLinkLimit 0;
FileMode 0664;
}
TreeDefault
{
Contents::Header "/srv/ftp.debian.org/dak/config/debian/Contents.top";
};
tree "dists/oldstable"
{
FileList "/srv/ftp.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp.debian.org/database/dists/oldstable_$(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";
};
// debian-installer
tree "dists/oldstable/main"
{
FileList "/srv/ftp.debian.org/database/dists/oldstable_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.etch.main.$(SECTION)";
SrcOverride "override.etch.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents "$(DIST)/../Contents-udeb";
};
tree "dists/oldstable/non-free"
{
FileList "/srv/ftp.debian.org/database/dists/oldstable_non-free_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.etch.main.$(SECTION)";
SrcOverride "override.etch.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents "$(DIST)/../Contents-udeb-nf";
};
Dir
Dir
{
ArchiveDir "/srv/ftp.debian.org/ftp/";
OverrideDir "/srv/ftp.debian.org/scripts/override/";
......@@ -24,10 +24,10 @@ tree "dists/stable"
FileList "/srv/ftp.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp.debian.org/database/dists/stable_$(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";
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";
};
// debian-installer
......@@ -36,9 +36,9 @@ tree "dists/stable/main"
{
FileList "/srv/ftp.debian.org/database/dists/stable_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.etch.main.$(SECTION)";
SrcOverride "override.etch.main.src";
Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.lenny.main.$(SECTION)";
SrcOverride "override.lenny.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents "$(DIST)/../Contents-udeb";
......@@ -48,9 +48,9 @@ tree "dists/stable/non-free"
{
FileList "/srv/ftp.debian.org/database/dists/stable_non-free_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.etch.main.$(SECTION)";
SrcOverride "override.etch.main.src";
Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc";
BinOverride "override.lenny.main.$(SECTION)";
SrcOverride "override.lenny.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents "$(DIST)/../Contents-udeb-nf";
......
......@@ -191,7 +191,7 @@ Check-Overrides
Suite
{
Stable
OldStable
{
Components
{
......@@ -223,6 +223,107 @@ Suite
OverrideCodeName "etch";
Priority "5";
Untouchable "1";
ChangeLogBase "dists/oldstable/";
UdebComponents
{
main;
non-free;
};
};
Oldstable-Proposed-Updates
{
Components
{
main;
contrib;
non-free;
};
Architectures
{
source;
all;
alpha;
amd64;
arm;
hppa;
i386;
ia64;
mips;
mipsel;
powerpc;
s390;
sparc;
};
Announce "debian-changes@lists.debian.org";
CopyChanges "dists/oldstable-proposed-updates/";
CopyDotDak "/srv/ftp.debian.org/queue/oldstable-proposed-updates/";
CommentsDir "/srv/ftp.debian.org/queue/o-p-u-new/COMMENTS/";
Version "4.0-updates";
Origin "Debian";
Description "Debian 4.0 Proposed Updates - Not Released";
CodeName "etch-proposed-updates";
OverrideCodeName "etch";
OverrideSuite "oldstable";
ValidTime 604800; // 7 days
Priority "4";
VersionChecks
{
MustBeNewerThan
{
OldStable;
};
MustBeOlderThan
{
Stable;
Testing;
Unstable;
Experimental;
};
Enhances
{
OldStable;
};
};
UdebComponents
{
main;
};
};
Stable
{
Components
{
main;
contrib;
non-free;
};
Architectures
{
source;
all;
alpha;
amd64;
arm;
armel;
hppa;
i386;
ia64;
mips;
mipsel;
powerpc;
s390;
sparc;
};
Announce "debian-changes@lists.debian.org";
// Version "5.0r0";
Origin "Debian";
// Description "Debian 5.0r0 Released 14 February 2009";
CodeName "lenny";
OverrideCodeName "lenny";
Priority "5";
Untouchable "1";
ChangeLogBase "dists/stable/";
UdebComponents
{
......@@ -246,6 +347,7 @@ Suite
alpha;
amd64;
arm;
armel;
hppa;
i386;
ia64;
......@@ -259,11 +361,11 @@ Suite
CopyChanges "dists/proposed-updates/";
CopyDotDak "/srv/ftp.debian.org/queue/proposed-updates/";
CommentsDir "/srv/ftp.debian.org/queue/p-u-new/COMMENTS/";
Version "4.0-updates";
Version "5.0-updates";
Origin "Debian";
Description "Debian 4.0 Proposed Updates - Not Released";
CodeName "etch-proposed-updates";
OverrideCodeName "etch";
Description "Debian 5.0 Proposed Updates - Not Released";
CodeName "lenny-proposed-updates";
OverrideCodeName "lenny";
OverrideSuite "stable";
ValidTime 604800; // 7 days
Priority "4";
......@@ -287,6 +389,7 @@ Suite
UdebComponents
{
main;
non-free;
};
};
......@@ -304,7 +407,6 @@ Suite
all;
alpha;
amd64;
arm;
armel;
hppa;
i386;
......@@ -318,8 +420,8 @@ Suite
Announce "debian-testing-changes@lists.debian.org";
Origin "Debian";
Description "Debian Testing distribution - Not Released";
CodeName "lenny";
OverrideCodeName "lenny";
CodeName "squeeze";
OverrideCodeName "squeeze";
ValidTime 604800; // 7 days
Priority "5";
UdebComponents
......@@ -343,7 +445,6 @@ Suite
all;
alpha;
amd64;
arm;
armel;
hppa;
i386;
......@@ -357,8 +458,8 @@ Suite
Announce "debian-testing-changes@lists.debian.org";
Origin "Debian";
Description "Debian Testing distribution updates - Not Released";
CodeName "lenny-proposed-updates";
OverrideCodeName "lenny";
CodeName "squeeze-proposed-updates";
OverrideCodeName "squeeze";
OverrideSuite "testing";
ValidTime 604800; // 7 days
Priority "6";
......@@ -428,7 +529,6 @@ Suite
all;
alpha;
amd64;
arm;
armel;
hppa;
hurd-i386;
......@@ -478,7 +578,6 @@ Suite
all;
alpha;
amd64;
arm;
armel;
hppa;
hurd-i386;
......@@ -521,11 +620,11 @@ Suite
SuiteMappings
{
// "propup-version oldstable-security stable testing testing-proposed-updates unstable";
"propup-version oldstable-security stable testing testing-proposed-updates unstable";
"propup-version stable-security testing testing-proposed-updates unstable";
"propup-version testing-security unstable";
// "map oldstable oldstable-proposed-updates";
// "map oldstable-security oldstable-proposed-updates";
"map oldstable oldstable-proposed-updates";
"map oldstable-security oldstable-proposed-updates";
"map stable proposed-updates";
"map stable-security proposed-updates";
"map stable-proposed-updates proposed-updates";
......
......@@ -25,7 +25,7 @@ incoming=$base/incoming
ftpgroup=debadmin
copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-free etch.non-free.src etch.extra.main etch.extra.non-free etch.extra.contrib etch.main.debian-installer sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free lenny.contrib lenny.contrib.src lenny.main lenny.main.src lenny.non-free lenny.non-free.src lenny.extra.main lenny.extra.contrib lenny.extra.non-free"
copyoverrides="etch.contrib etch.contrib.src etch.main etch.main.src etch.non-free etch.non-free.src etch.extra.main etch.extra.non-free etch.extra.contrib etch.main.debian-installer sid.contrib sid.contrib.src sid.main sid.main.debian-installer sid.main.src sid.non-free sid.non-free.src sid.extra.contrib sid.extra.main sid.extra.non-free lenny.contrib lenny.contrib.src lenny.main lenny.main.src lenny.non-free lenny.non-free.src lenny.extra.main lenny.extra.contrib lenny.extra.non-free squeeze.contrib squeeze.contrib.src squeeze.main squeeze.main.src squeeze.non-free squeeze.non-free.src squeeze.extra.main squeeze.extra.contrib squeeze.extra.non-free"
PATH=$masterdir:$PATH
umask 022
......
......@@ -87,7 +87,7 @@ done
done
)
(cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-lenny.list.gz) |
(cat ../arch-i386.files ../arch-amd64.files; zcat suite-oldstable.list.gz suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-lenny.list.gz) |
sort -u | poolfirst > ../typical.files
rm -f $ARCHLIST
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册