Switch to using codenames

Use codenames for suites instead of alias names where possible.

diff --git a/config.sh.sed.in b/config.sh.sed.in
index e392f3392cf11734b42c5c5e681607bf5741b423..361bf70ff1a449e336088284936170880260bc63 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -42,17 +42,17 @@ ddtplangs="de cs da eo es fi fr hu it ja nl pl pt_BR pt_PT ru sk sv_SE uk"
 archives="us security amd64 gnuab backports volatile"
 sections="main contrib non-free"
 parts="$sections"
-suites="oldstable oldstable-volatile oldstable-backports stable etch-m68k stable-volatile stable-backports testing unstable experimental"
+suites="sarge sarge-volatile sarge-backports etch etch-m68k etch-volatile etch-backports lenny sid experimental"
 priorities="required important standard optional extra"
 dists="$suites"
 architectures="alpha amd64 arm armel hppa hurd-i386 i386 ia64 kfreebsd-i386 kfreebsd-amd64 m68k mips mipsel powerpc s390 sparc"
-arch_oldstable="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
-arch_stable="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
-arch_testing="${arch_stable}"
-arch_unstable="${arch_oldstable} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
-arch_experimental="${arch_unstable}"
-arch_testing_proposed_updates="${arch_testing}"
-arch_stable_proposed_updates="${arch_stable}"
+arch_sarge="alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc"
+arch_etch="alpha amd64 arm hppa i386 ia64 mips mipsel powerpc s390 sparc"
+arch_lenny="${arch_etch}"
+arch_sid="${arch_sarge} armel hurd-i386 kfreebsd-i386 kfreebsd-amd64"
+arch_experimental="${arch_sid}"
+arch_lenny_proposed_updates="${arch_lenny}"
+arch_etch_proposed_updates="${arch_etch}"
 
 # Miscellaneous
 #

diff --git a/cron.d/100syncarchive b/cron.d/100syncarchive
index 928fefc07b5bc653bdabcfa4ada5207439df0b28..1436bd971ff327e07f52edc50ee71ed607b27ab3 100755 (executable)
--- a/cron.d/100syncarchive
+++ b/cron.d/100syncarchive
@@ -86,7 +86,7 @@ fi
 
 # security archive
 #
-for dist in oldstable stable testing
+for dist in sarge etch lenny
 do
     echo "retrieve Release(.gpg) $dist"
     test -d security/${dist} || mkdir -p security/${dist}

diff --git a/cron.d/100syncarchive_amd64 b/cron.d/100syncarchive_amd64
index 03fd1092ef25445b6b29c242656931d3bc95cbf9..417e8c6d8f7e5e08e12f4619c7eac2487c3d46b8 100755 (executable)
--- a/cron.d/100syncarchive_amd64
+++ b/cron.d/100syncarchive_amd64
@@ -9,7 +9,7 @@ cd ${archivedir}
 #
 arch=amd64
 
-for dist in oldstable
+for dist in sarge
   do
   echo "retrieve Release(.gpg) $dist"
   test -d amd64/${dist} || mkdir -p amd64/${dist}

diff --git a/cron.d/100syncarchive_backports b/cron.d/100syncarchive_backports
index 6411eb1b005c9273dd998f2368cefb86027cb5b8..be82d5f088c89433e8e043014deb59136f5247a7 100755 (executable)
--- a/cron.d/100syncarchive_backports
+++ b/cron.d/100syncarchive_backports
@@ -7,13 +7,13 @@ cd ${archivedir}
 
 # backports archive
 #
-for dist in oldstable
+for dist in sarge etch
 do
   echo "retrieve Release(.gpg) $dist-backports"
   test -d backports/${dist}-backports || mkdir -p backports/${dist}-backports
   (cd backports/${dist}-backports &&
-           wget -q -N ${backports_ftpsite}/dists/sarge-backports/Release &&
-           wget -q -N ${backports_ftpsite}/dists/sarge-backports/Release.gpg )
+           wget -q -N ${backports_ftpsite}/dists/${dist}-backports/Release &&
+           wget -q -N ${backports_ftpsite}/dists/${dist}-backports/Release.gpg )
 
     foo=\$arch_${dist//-/_}
     for arch in `eval echo $foo`
@@ -23,17 +23,17 @@ do
        echo retrieve Packages $dist-backports/$part/$arch
        test -d backports/${dist}-backports/${part}/binary-${arch} || mkdir -p backports/${dist}-backports/${part}/binary-${arch}
        (cd backports/${dist}-backports/${part}/binary-${arch} &&
-           wget -q -N ${backports_ftpsite}/dists/sarge-backports/${part}/binary-${arch}/Packages.gz)
+           wget -q -N ${backports_ftpsite}/dists/${dist}-backports/${part}/binary-${arch}/Packages.gz)
       done
       echo retrieve Contents $dist-backports/$arch
       (cd backports/${dist}-backports &&
-         wget -q -N ${backports_ftpsite}/dists/sarge-backports/Contents-${arch}.gz)
+         wget -q -N ${backports_ftpsite}/dists/${dist}-backports/Contents-${arch}.gz)
     done
     for part in ${parts}
     do
         echo retrieve Sources $dist-backports/$part
         test -d backports/${dist}-backports/${part}/source || mkdir -p backports/${dist}-backports/${part}/source
         (cd backports/${dist}-backports/${part}/source &&
-            wget -q -N ${backports_ftpsite}/dists/sarge-backports/${part}/source/Sources.gz)
+            wget -q -N ${backports_ftpsite}/dists/${dist}-backports/${part}/source/Sources.gz)
     done
 done

diff --git a/cron.d/100syncarchive_gnuab b/cron.d/100syncarchive_gnuab
index 1295c633f930a4d91ea41caee35dddff91974d58..b42d165cbd6f19000d5c34602d47c8aa0f00ecea 100755 (executable)
--- a/cron.d/100syncarchive_gnuab
+++ b/cron.d/100syncarchive_gnuab
@@ -9,7 +9,7 @@ cd ${archivedir}
 #
 architectures="armel kfreebsd-i386 kfreebsd-amd64"
 
-for dist in unstable experimental
+for dist in sid experimental
   do
   echo "retrieve Release(.gpg) $dist"
   test -d gnuab/${dist} || mkdir -p gnuab/${dist}

diff --git a/cron.d/100syncarchive_volatile b/cron.d/100syncarchive_volatile
index b8cef9ab85ee3adf67ad770e3743210676faa1e9..ab2bf5e870eb3d712f6abb1f8980185ff0e36d98 100755 (executable)
--- a/cron.d/100syncarchive_volatile
+++ b/cron.d/100syncarchive_volatile
@@ -7,7 +7,7 @@ cd ${archivedir}
 
 # volatile archive
 #
-for dist in oldstable stable
+for dist in sarge etch
 do
   echo "retrieve Release(.gpg) $dist-volatile"
   test -d volatile/${dist}-volatile || mkdir -p volatile/${dist}-volatile

diff --git a/cron.d/120synctrans b/cron.d/120synctrans
index add4c3513a50937145669a38718c17eb927064d2..12767abce8ae8a68fb25a6f98dd03f73cb588808 100755 (executable)
--- a/cron.d/120synctrans
+++ b/cron.d/120synctrans
@@ -8,7 +8,7 @@ cd ${archivedir}
 if [ -z "${localdir}" ]
 then
     echo using remote mirror
-    for dist in unstable
+    for dist in sid
     do
        for part in main
        do
@@ -23,7 +23,7 @@ then
     done
 else
     echo using local mirror
-    for dist in unstable
+    for dist in sid
     do
        for part in main
        do

diff --git a/cron.d/600prepare_newpkg b/cron.d/600prepare_newpkg
index 083d72ec0b281c2905a93da1e2163fe9f3692fc0..bddf65bb57d1b206f9df07ca53e6074ac6ae6c62 100755 (executable)
--- a/cron.d/600prepare_newpkg
+++ b/cron.d/600prepare_newpkg
@@ -5,11 +5,11 @@
 packagesdir=${filesdir}/packages
 test -d ${packagesdir} || mkdir -p ${packagesdir}
 
-LANG=C cat ${filesdir}/db/package_names_unstable.txt \
-    | sort | uniq > ${packagesdir}/package_names_unstable.$(date -I)
+LANG=C cat ${filesdir}/db/package_names_sid.txt \
+    | sort | uniq > ${packagesdir}/package_names_sid.$(date -I)
 LANG=C cat ${filesdir}/db/source_names_unstable.txt \
-    | sort | uniq > ${packagesdir}/source_names_unstable.$(date -I)
+    | sort | uniq > ${packagesdir}/source_names_sid.$(date -I)
 
 cd $topdir
 
-./bin/newpkg_info unstable
+./bin/newpkg_info sid

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 3dcab38719d42f772282f87e748a57658ad93777..9d38c1788e63cf82b196d6950271261390c3bb35 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -171,7 +171,11 @@ sub do_dispatch {
            my %SUITES_ALIAS = ( sarge => 'oldstable',
                                 etch => 'stable',
                                 lenny => 'testing',
-                                sid => 'unstable', );
+                                sid => 'unstable',
+                                oldstable => 'sarge',
+                                stable => 'etch',
+                                testing => 'lenny',
+                                unstable => 'sid', );
            my %SECTIONS = map { $_ => 1 } @SECTIONS;
            my %ARCHIVES = map { $_ => 1 } @ARCHIVES;
            my %ARCHITECTURES = map { $_ => 1 } (@ARCHITECTURES, 'all', 'any');