[dak/master] Adjust for squeeze.stable
Signed-off-by: Joerg Jaspert <joerg@debian.org>
---
config/debian-security/apt.conf | 27 +++++++--
config/debian-security/apt.conf.buildd | 13 ++++
config/debian-security/cron.daily | 8 +-
config/debian-security/dak.conf | 25 +++++++-
config/debian/apt.conf | 104 ++++++++++++++++----------------
config/debian/apt.conf.oldstable | 20 +++---
config/debian/apt.conf.stable | 20 +++---
config/debian/dak.conf | 54 ++++++++++++++---
config/debian/dinstall.functions | 10 ++--
config/debian/vars | 2 +-
dak/generate_packages_sources.py | 34 +++++-----
scripts/debian/ddtp-i18n-check.sh | 2 +-
12 files changed, 202 insertions(+), 117 deletions(-)
diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index 456bfcb..70112a8 100644
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -15,10 +15,10 @@ Default
FileMode 0664;
}
-tree "dists/stable/updates"
+tree "dists/oldstable/updates"
{
- FileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
- SourceFileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
+ 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 armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
BinOverride "override.lenny.$(SECTION)";
@@ -29,10 +29,11 @@ tree "dists/stable/updates"
Sources::Compress "gzip bzip2";
};
-tree "dists/testing/updates"
+
+tree "dists/stable/updates"
{
- FileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
- SourceFileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
+ FileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";
+ SourceFileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc source";
BinOverride "override.squeeze.$(SECTION)";
@@ -42,3 +43,17 @@ tree "dists/testing/updates"
Packages::Compress "gzip bzip2";
Sources::Compress "gzip bzip2";
};
+
+tree "dists/testing/updates"
+{
+ FileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_binary-$(ARCH).list";
+ SourceFileList "/srv/security-master.debian.org/dak-database/dists/testing_updates/$(SECTION)_source.list";
+ Sections "main contrib non-free";
+ Architectures "alpha amd64 armel hppa i386 ia64 kfreebsd-i386 kfreebsd-amd64 mips mipsel powerpc s390 sparc source";
+ BinOverride "override.wheezy.$(SECTION)";
+ ExtraOverride "override.wheezy.extra.$(SECTION)";
+ SrcOverride "override.wheezy.$(SECTION).src";
+ Contents " ";
+ Packages::Compress "gzip bzip2";
+ Sources::Compress "gzip bzip2";
+};
diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd
index b16d0c9..336112f 100644
--- a/config/debian-security/apt.conf.buildd
+++ b/config/debian-security/apt.conf.buildd
@@ -40,3 +40,16 @@ bindirectory "squeeze"
PathPrefix "";
Packages::Extensions ".deb .udeb";
};
+
+bindirectory "wheezy"
+{
+ Packages "wheezy/Packages";
+ Sources "wheezy/Sources";
+ Contents " ";
+
+ BinOverride "override.wheezy.all3";
+ SrcOverride "override.wheezy.all3.src";
+ BinCacheDB "packages-accepted-squeeze.db";
+ PathPrefix "";
+ Packages::Extensions ".deb .udeb";
+};
diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index da56697..213b0a9 100755
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -20,9 +20,9 @@ find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
for suite in $suites; do
case $suite in
- oldstable) override_suite=etch;;
- stable) override_suite=lenny;;
- testing) override_suite=squeeze;;
+ oldstable) override_suite=lenny;;
+ stable) override_suite=squeeze;;
+ testing) override_suite=wheezy;;
*) echo "Unknown suite type ($suite)"; exit 1;;
esac
for component in $components; do
@@ -44,7 +44,7 @@ for suite in $suites; do
done
# Generate .all3 overides for the buildd support
-for dist in etch lenny squeeze; do
+for dist in lenny squeeze wheezy; do
rm -f override.$dist.all3
components="main contrib non-free";
if [ -f override.$dist.main.debian-installer.gz ]; then
diff --git a/config/debian-security/dak.conf b/config/debian-security/dak.conf
index 21e1768..4acfa17 100644
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -150,7 +150,7 @@ Suite
// Priority determines which suite is used for the Maintainers file
// as generated by 'dak make-maintainers' (highest wins).
- Stable
+ OldStable
{
Components
{
@@ -169,7 +169,7 @@ Suite
CopyDotDak "/srv/security-master.debian.org/queue/done/";
};
- Testing
+ Stable
{
Components
{
@@ -181,12 +181,31 @@ Suite
Version "";
Origin "Debian";
Label "Debian-Security";
- Description "Debian testing Security Updates";
+ Description "Debian 6.0 Security Updates";
ValidTime 864000; // 10 days
CodeName "squeeze";
OverrideCodeName "squeeze";
CopyDotDak "/srv/security-master.debian.org/queue/done/";
};
+
+ Testing
+ {
+ Components
+ {
+ updates/main;
+ updates/contrib;
+ updates/non-free;
+ };
+ Announce "dak@security.debian.org";
+ Version "";
+ Origin "Debian";
+ Label "Debian-Security";
+ Description "Debian testing Security Updates";
+ ValidTime 864000; // 10 days
+ CodeName "wheezy";
+ OverrideCodeName "wheezy";
+ CopyDotDak "/srv/security-master.debian.org/queue/done/";
+ };
};
SuiteMappings
diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 4937b23..6faf2e1 100644
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -20,63 +20,63 @@ TreeDefault
Contents::Header "/srv/ftp-master.debian.org/dak/config/debian/Contents.top";
};
-//tree "dists/oldstable-proposed-updates"
-//{
-// FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list";
-// SourceFileList "/srv/ftp-master.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)";
-// ExtraOverride "override.etch.extra.$(SECTION)";
-// SrcOverride "override.etch.$(SECTION).src";
-// Contents " ";
-//};
+tree "dists/oldstable-proposed-updates"
+{
+ FileList "/srv/ftp-master.debian.org/database/dists/oldstable-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+ SourceFileList "/srv/ftp-master.debian.org/database/dists/oldstable-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/proposed-updates"
{
FileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp-master.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";
+ Architectures "amd64 armel 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/testing"
+tree "dists/squeeze-updates"
{
- FakeDI "dists/unstable";
- FileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
- SourceFileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_source.list";
+ FileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_binary-$(ARCH).list";
+ SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "amd64 armel 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/testing-proposed-updates"
+tree "dists/testing"
{
- FileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
- SourceFileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
+ FakeDI "dists/unstable";
+ FileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_binary-$(ARCH).list";
+ SourceFileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "amd64 armel 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 " ";
+ BinOverride "override.wheezy.$(SECTION)";
+ ExtraOverride "override.wheezy.extra.$(SECTION)";
+ SrcOverride "override.wheezy.$(SECTION).src";
};
-tree "dists/squeeze-updates"
+tree "dists/testing-proposed-updates"
{
- FileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_binary-$(ARCH).list";
- SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-updates_$(SECTION)_source.list";
+ FileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+ SourceFileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "amd64 armel 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";
+ BinOverride "override.wheezy.$(SECTION)";
+ ExtraOverride "override.wheezy.extra.$(SECTION)";
+ SrcOverride "override.wheezy.$(SECTION).src";
Contents " ";
};
@@ -93,25 +93,25 @@ tree "dists/unstable"
// debian-installer
-//tree "dists/oldstable-proposed-updates/main"
-//{
-// FileList "/srv/ftp-master.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)";
-// SrcOverride "override.etch.main.src";
-// BinCacheDB "packages-debian-installer-$(ARCH).db";
-// Packages::Extensions ".udeb";
-// Contents " ";
-//};
+tree "dists/oldstable-proposed-updates/main"
+{
+ FileList "/srv/ftp-master.debian.org/database/dists/oldstable-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/proposed-updates/main"
{
FileList "/srv/ftp-master.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";
+ Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
+ BinOverride "override.squeeze.main.$(SECTION)";
+ SrcOverride "override.squeeze.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents " ";
@@ -122,8 +122,8 @@ tree "dists/testing/main"
FileList "/srv/ftp-master.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
- BinOverride "override.squeeze.main.$(SECTION)";
- SrcOverride "override.squeeze.main.src";
+ BinOverride "override.wheezy.main.$(SECTION)";
+ SrcOverride "override.wheezy.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents "$(DIST)/../Contents-udeb";
@@ -134,8 +134,8 @@ tree "dists/testing/non-free"
FileList "/srv/ftp-master.debian.org/database/dists/testing_non-free_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
- BinOverride "override.squeeze.main.$(SECTION)";
- SrcOverride "override.squeeze.main.src";
+ BinOverride "override.wheezy.main.$(SECTION)";
+ SrcOverride "override.wheezy.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents "$(DIST)/../Contents-udeb-nf";
@@ -146,8 +146,8 @@ tree "dists/testing-proposed-updates/main"
FileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64";
- BinOverride "override.squeeze.main.$(SECTION)";
- SrcOverride "override.squeeze.main.src";
+ BinOverride "override.wheezy.main.$(SECTION)";
+ SrcOverride "override.wheezy.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents " ";
diff --git a/config/debian/apt.conf.oldstable b/config/debian/apt.conf.oldstable
index 1cfe235..0bc8839 100644
--- a/config/debian/apt.conf.oldstable
+++ b/config/debian/apt.conf.oldstable
@@ -24,10 +24,10 @@ tree "dists/oldstable"
FileList "/srv/ftp-master.debian.org/database/dists/oldstable_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp-master.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";
+ 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/oldstable/main"
{
FileList "/srv/ftp-master.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";
+ Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+ 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/oldstable/non-free"
{
FileList "/srv/ftp-master.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";
+ Architectures "alpha amd64 arm armel hppa i386 ia64 mips mipsel powerpc s390 sparc source";
+ BinOverride "override.lenny.main.$(SECTION)";
+ SrcOverride "override.lenny.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents "$(DIST)/../Contents-udeb-nf";
diff --git a/config/debian/apt.conf.stable b/config/debian/apt.conf.stable
index 0e854c1..0b61d23 100644
--- a/config/debian/apt.conf.stable
+++ b/config/debian/apt.conf.stable
@@ -24,10 +24,10 @@ tree "dists/stable"
FileList "/srv/ftp-master.debian.org/database/dists/stable_$(SECTION)_binary-$(ARCH).list";
SourceFileList "/srv/ftp-master.debian.org/database/dists/stable_$(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 "amd64 armel 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";
};
// debian-installer
@@ -36,9 +36,9 @@ tree "dists/stable/main"
{
FileList "/srv/ftp-master.debian.org/database/dists/stable_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 "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+ BinOverride "override.squeeze.main.$(SECTION)";
+ SrcOverride "override.squeeze.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-master.debian.org/database/dists/stable_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 "amd64 armel i386 ia64 mips mipsel powerpc s390 sparc kfreebsd-i386 kfreebsd-amd64 source";
+ BinOverride "override.squeeze.main.$(SECTION)";
+ SrcOverride "override.squeeze.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents "$(DIST)/../Contents-udeb-nf";
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 0a3e70c..2741eed 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -168,6 +168,16 @@ Check-Overrides
Suite
{
+ OldStable
+ {
+ Components
+ {
+ main;
+ contrib;
+ non-free;
+ };
+ };
+
Stable
{
Components
@@ -178,6 +188,27 @@ Suite
};
};
+ OldStable-Proposed-Updates
+ {
+ Components
+ {
+ main;
+ contrib;
+ non-free;
+ };
+ VersionChecks
+ {
+ MustBeNewerThan
+ {
+ OldStable;
+ };
+ Enhances
+ {
+ OldStable;
+ };
+ };
+ };
+
Proposed-Updates
{
Components
@@ -258,11 +289,17 @@ Suite
MustBeNewerThan
{
Stable;
- Testing;
};
+ MustBeOlderThan
+ {
+ Testing;
+ Testing-Proposed-Updates;
+ Unstable;
+ Experimental;
+ };
Enhances
{
- Testing;
+ Stable;
};
};
@@ -315,19 +352,20 @@ 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 lenny stable";
- "map squeeze testing";
+ "map lenny oldstable";
+ "map squeeze stable";
+ "map wheezy testing";
"map sid unstable";
"map rc-buggy experimental";
-// "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";
-// "map-unreleased oldstable unstable";
+ "map-unreleased oldstable unstable";
"map-unreleased stable unstable";
"map-unreleased proposed-updates unstable";
"map testing testing-proposed-updates";
diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index f3ab381..1834841 100644
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -123,7 +123,7 @@ function i18n1() {
# Lets check!
if ${scriptsdir}/ddtp-i18n-check.sh . ${scriptdir}/i18n/${TSTAMP}; then
# Yay, worked, lets copy around
- for dir in squeeze sid; do
+ for dir in wheezy sid; do
if [ -d dists/${dir}/ ]; then
cd dists/${dir}/main/i18n
rsync -aq --delete --delete-after . ${ftpdir}/dists/${dir}/main/i18n/.
@@ -401,12 +401,12 @@ function mkfilesindices() {
done
(cd $base/ftp/
- for dist in sid squeeze; do
+ for dist in sid wheezy; do
find ./dists/$dist/main/i18n/ \! -type d | sort -u | gzip -9 > $base/ftp/indices/files/components/translation-$dist.list.gz
done
)
- (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-squeeze.list.gz) |
+ (cat ../arch-i386.files ../arch-amd64.files; zcat suite-proposed-updates.list.gz ; zcat translation-sid.list.gz ; zcat translation-wheezy.list.gz) |
sort -u | poolfirst > ../typical.files
rm -f $ARCHLIST
@@ -491,8 +491,8 @@ function i18n2() {
STAMP=$(date "+%Y%m%d%H%M")
mkdir -p ${scriptdir}/i18n/${STAMP}
cd ${scriptdir}/i18n/${STAMP}
- dak control-suite -l stable > lenny
- dak control-suite -l testing > squeeze
+ dak control-suite -l stable > squeeze
+ dak control-suite -l testing > wheezy
dak control-suite -l unstable > sid
echo "${STAMP}" > timestamp
gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 55BE302B --detach-sign -o timestamp.gpg timestamp
diff --git a/config/debian/vars b/config/debian/vars
index 5907d28..19dee85 100644
--- a/config/debian/vars
+++ b/config/debian/vars
@@ -30,7 +30,7 @@ exportpublic=$public/rsync/export/
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 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"
+copyoverrides="wheezy.contrib wheezy.contrib.src wheezy.main wheezy.main.src wheezy.non-free wheezy.non-free.src wheezy.extra.main wheezy.extra.non-free wheezy.extra.contrib wheezy.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"
TMPDIR=${base}/tmp
diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py
index 0048908..f1d07fa 100755
--- a/dak/generate_packages_sources.py
+++ b/dak/generate_packages_sources.py
@@ -111,9 +111,9 @@ tree "dists/testing"
SourceFileList "/srv/ftp-master.debian.org/database/dists/testing_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "%(arch)s";
- BinOverride "override.squeeze.$(SECTION)";
- ExtraOverride "override.squeeze.extra.$(SECTION)";
- SrcOverride "override.squeeze.$(SECTION).src";
+ BinOverride "override.wheezy.$(SECTION)";
+ ExtraOverride "override.wheezy.extra.$(SECTION)";
+ SrcOverride "override.wheezy.$(SECTION).src";
};
"""
@@ -137,8 +137,8 @@ tree "dists/testing/main"
FileList "/srv/ftp-master.debian.org/database/dists/testing_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "%(arch)s";
- BinOverride "override.squeeze.main.$(SECTION)";
- SrcOverride "override.squeeze.main.src";
+ BinOverride "override.wheezy.main.$(SECTION)";
+ SrcOverride "override.wheezy.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
%(contentsline)s
@@ -149,8 +149,8 @@ tree "dists/testing/non-free"
FileList "/srv/ftp-master.debian.org/database/dists/testing_non-free_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "%(arch)s";
- BinOverride "override.squeeze.main.$(SECTION)";
- SrcOverride "override.squeeze.main.src";
+ BinOverride "override.wheezy.main.$(SECTION)";
+ SrcOverride "override.wheezy.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
%(contentsline)s
@@ -239,9 +239,9 @@ tree "dists/testing-proposed-updates"
SourceFileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "%(arch)s";
- BinOverride "override.squeeze.$(SECTION)";
- ExtraOverride "override.squeeze.extra.$(SECTION)";
- SrcOverride "override.squeeze.$(SECTION).src";
+ BinOverride "override.wheezy.$(SECTION)";
+ ExtraOverride "override.wheezy.extra.$(SECTION)";
+ SrcOverride "override.wheezy.$(SECTION).src";
Contents " ";
};
"""
@@ -251,8 +251,8 @@ tree "dists/testing-proposed-updates/main"
FileList "/srv/ftp-master.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "%(arch)s";
- BinOverride "override.squeeze.main.$(SECTION)";
- SrcOverride "override.squeeze.main.src";
+ BinOverride "override.wheezy.main.$(SECTION)";
+ SrcOverride "override.wheezy.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents " ";
@@ -266,9 +266,9 @@ tree "dists/proposed-updates"
SourceFileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_$(SECTION)_source.list";
Sections "main contrib non-free";
Architectures "%(arch)s";
- BinOverride "override.lenny.$(SECTION)";
- ExtraOverride "override.lenny.extra.$(SECTION)";
- SrcOverride "override.lenny.$(SECTION).src";
+ BinOverride "override.squeeze.$(SECTION)";
+ ExtraOverride "override.squeeze.extra.$(SECTION)";
+ SrcOverride "override.squeeze.$(SECTION).src";
Contents " ";
};
"""
@@ -278,8 +278,8 @@ tree "dists/proposed-updates/main"
FileList "/srv/ftp-master.debian.org/database/dists/proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
Sections "debian-installer";
Architectures "%(arch)s";
- BinOverride "override.lenny.main.$(SECTION)";
- SrcOverride "override.lenny.main.src";
+ BinOverride "override.squeeze.main.$(SECTION)";
+ SrcOverride "override.squeeze.main.src";
BinCacheDB "packages-debian-installer-$(ARCH).db";
Packages::Extensions ".udeb";
Contents " ";
diff --git a/scripts/debian/ddtp-i18n-check.sh b/scripts/debian/ddtp-i18n-check.sh
index 1d37364..cefb68e 100755
--- a/scripts/debian/ddtp-i18n-check.sh
+++ b/scripts/debian/ddtp-i18n-check.sh
@@ -81,7 +81,7 @@ elif [ ! -d "$PACKAGES_LISTS_DIR" ]; then
fi
#STABLE="lenny"
-TESTING="squeeze"
+TESTING="wheezy"
UNSTABLE="sid"
# Original SHA256SUMS, generated by i18n.debian.net
--
1.5.6.5
Reply to: