remove lenny

Signed-off-by: Joerg Jaspert <joerg@debian.org>

diff --git a/config/backports/apt.conf b/config/backports/apt.conf
index 0b17a106d3a788fc7cde11e59052d00120e0f325..e9a1e9fdf97645b69c88859112b5bafee7d8f28b 100644 (file)
--- a/config/backports/apt.conf
+++ b/config/backports/apt.conf
@@ -20,40 +20,6 @@ TreeDefault
    Contents::Header "/srv/backports-master.debian.org/dak/config/backports/Contents.top";
 };
 
-tree "dists/lenny-backports"
-{
-   FileList "/srv/backports-master.debian.org/database/dists/lenny-backports_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/backports-master.debian.org/database/dists/lenny-backports_$(SECTION)_source.list";
-   Sections "main contrib non-free";
-   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
-   BinOverride "override.lenny-backports.$(SECTION)";
-   ExtraOverride "override.lenny-backports.extra.$(SECTION)";
-   SrcOverride "override.lenny-backports.$(SECTION).src";
-};
-
-tree "dists/lenny-backports-sloppy"
-{
-   FileList "/srv/backports-master.debian.org/database/dists/lenny-backports-sloppy_$(SECTION)_binary-$(ARCH).list";
-   SourceFileList "/srv/backports-master.debian.org/database/dists/lenny-backports-sloppy_$(SECTION)_source.list";
-   Sections "main contrib non-free";
-   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
-   BinOverride "override.lenny-backports.$(SECTION)";
-   ExtraOverride "override.lenny-backports.extra.$(SECTION)";
-   SrcOverride "override.lenny-backports.$(SECTION).src";
-};
-
-tree "dists/lenny-backports/main"
-{
-   FileList "/srv/backports-master.debian.org/database/dists/lenny-backports_main_$(SECTION)_binary-$(ARCH).list";
-   Sections "debian-installer";
-   Architectures "alpha amd64 arm armel hppa hurd-i386 i386 ia64 mips mipsel powerpc s390 sparc source";
-   BinOverride "override.lenny-backports.main.$(SECTION)";
-   SrcOverride "override.lenny-backports.main.src";
-   BinCacheDB "packages-debian-installer-$(ARCH).db";
-   Packages::Extensions ".udeb";
-   Contents "$(DIST)/../Contents-udeb";
-};
-
 tree "dists/squeeze-backports"
 {
    FileList "/srv/backports-master.debian.org/database/dists/squeeze-backports_$(SECTION)_binary-$(ARCH).list";

diff --git a/config/backports/cron.unchecked b/config/backports/cron.unchecked
index 46f30e07c8655a758c9db6bb97c5b3ed5ad3d1fb..423ce77dd7f3d995589310d0068c3f42954667b2 100755 (executable)
--- a/config/backports/cron.unchecked
+++ b/config/backports/cron.unchecked
@@ -65,9 +65,9 @@ function do_buildd () {
         dak make-overrides &>/dev/null
         rm -f override.sid.all3 override.sid.all3.src
         for i in main contrib non-free main.debian-installer; do
-            cat override.lenny-backports.$i >> override.sid.all3
+            cat override.squeeze-backports.$i >> override.sid.all3
             if [ "$i" != "main.debian-installer" ]; then
-                cat override.lenny-backports.$i.src >> override.sid.all3.src
+                cat override.squeeze-backports.$i.src >> override.sid.all3.src
             fi
         done
         make_buildd_dir

diff --git a/config/backports/dak.conf b/config/backports/dak.conf
index 0955995302ccbe6e23b3aa1f2a1972ca3b691c4f..ec7ff5fd8b9cec2c7be4225467ac499e94f6789f 100644 (file)
--- a/config/backports/dak.conf
+++ b/config/backports/dak.conf
@@ -27,7 +27,7 @@ Dinstall
    // If defined then mails to close bugs are sent to the bugserver.
    CloseBugs "false";
    OverrideDisparityCheck "false";
-   DefaultSuite "lenny-backports";
+   DefaultSuite "squeeze-backports";
    ReleaseTransitions "/srv/backports-master.debian.org/hints/transitions.yaml";
    // If set, only send mails to addresses listed there.
    // format of entries: one entry per line. Either an email address directly, or a regular expression,
@@ -74,18 +74,6 @@ Check-Overrides
 {
   OverrideSuites
   {
-    lenny-backports
-    {
-      Process "1";
-//      OriginSuite "Unstable";
-    };
-
-    lenny-backports-sloppy
-    {
-      Process "1";
-//      OriginSuite "Unstable";
-    };
-
     squeeze-backports
     {
       Process "1";
@@ -126,7 +114,7 @@ Control-Overrides
   Options
   {
     Component "main";
-    Suite "lenny-backports";
+    Suite "squeeze-backports";
     Type "deb";
    };
 };
@@ -135,7 +123,7 @@ Rm
 {
   Options
   {
-    Suite "lenny-backports";
+    Suite "squeeze-backports";
    };
 
    LogFile "/srv/backports-web.debian.org/underlay/removals.txt";
@@ -163,26 +151,6 @@ Process-New
 
 Suite
 {
-  lenny-backports
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-  };
-
-  lenny-backports-sloppy
-  {
-       Components
-       {
-         main;
-         contrib;
-         non-free;
-       };
-  };
-
   squeeze-backports
   {
        Components
@@ -240,9 +208,6 @@ DB
 
 SuiteMappings
 {
- "map lenny lenny-backports";
- "map lenny-bpo lenny-backports";
- "map lenny-bpo-sloppy lenny-backports-sloppy";
  "map squeeze squeeze-backports";
  "map squeeze-bpo squeeze-backports";
 };
@@ -387,20 +352,14 @@ Generate-Releases
 {
   MD5Sum
   {
-    lenny-backports;
-    lenny-backports-sloppy;
     squeeze-backports;
   };
   SHA1
   {
-    lenny-backports;
-    lenny-backports-sloppy;
     squeeze-backports;
   };
   SHA256
   {
-    lenny-backports;
-    lenny-backports-sloppy;
     squeeze-backports;
   };
 }

diff --git a/config/backports/dinstall.functions b/config/backports/dinstall.functions
index 73b801e4965fe58b6f07d0a81a9f62f7cb011a0e..8709e6e1132d80eb848895393d1d0606062f61cf 100644 (file)
--- a/config/backports/dinstall.functions
+++ b/config/backports/dinstall.functions
@@ -154,7 +154,7 @@ function overrides() {
 
     # FIXME
     rm -f override.sid.all3
-    for i in main contrib non-free main.debian-installer; do cat override.lenny-backports.$i >> override.sid.all3; done
+    for i in main contrib non-free main.debian-installer; do cat override.squeeze-backports.$i >> override.sid.all3; done
 }
 
 function mpfm() {

diff --git a/config/backports/vars b/config/backports/vars
index e6ed91a60f8a135a1e01a4b8a177ff6751e11864..5a1ca15ba7e2af2734709a8f4de3d7c979d13ee3 100644 (file)
--- a/config/backports/vars
+++ b/config/backports/vars
@@ -34,7 +34,7 @@ exportpublic=$public/export/
 
 ftpgroup=debadmin
 
-copyoverrides="lenny-backports.contrib lenny-backports.contrib.src lenny-backports.main lenny-backports.main.debian-installer lenny-backports.main.src lenny-backports.extra.contrib lenny-backports.extra.main"
+copyoverrides="squeeze-backports.contrib squeeze-backports.contrib.src squeeze-backports.main squeeze-backports.main.debian-installer squeeze-backports.main.src squeeze-backports.extra.contrib squeeze-backports.extra.main"
 
 # Change this to your hostname
 uploadhost=localhost
@@ -42,7 +42,7 @@ uploaddir=/pub/UploadQueue/
 
 # What components to support
 components="main contrib non-free"
-suites="lenny-backports"
+suites="squeeze-backports"
 override_types="deb dsc udeb"
 
 # export TMP=/srv/backports-master.debian.org/tmp

diff --git a/config/debian-security/apache.conf b/config/debian-security/apache.conf
index d8038cc84e3e2d6113d8de08ae8b5c6e8bf2a873..c022c8bd7ec07e48d6c6362c099111226f2ff6d4 100644 (file)
--- a/config/debian-security/apache.conf
+++ b/config/debian-security/apache.conf
@@ -15,12 +15,11 @@
     #RewriteRule ^/$    http://www.debian.org/security/
 
     # New suite aliases
-    Alias /buildd-lenny /srv/security-master.debian.org/buildd/lenny/
     Alias /buildd-squeeze /srv/security-master.debian.org/buildd/squeeze/
     Alias /buildd-wheezy /srv/security-master.debian.org/buildd/wheezy/
 
     # BuildD access list
-    <LocationMatch "^/(buildd|buildd-lenny|buildd-squeeze|buildd-wheezy|debian-security)/">
+    <LocationMatch "^/(buildd|buildd-squeeze|buildd-wheezy|debian-security)/">
         order deny,allow
         deny from all
 

diff --git a/config/debian-security/apt.conf b/config/debian-security/apt.conf
index fcac94d2290652dc2b977354ce3e796fcb8e820e..aba34097a60aca561601ed74c839f06603bb314e 100644 (file)
--- a/config/debian-security/apt.conf
+++ b/config/debian-security/apt.conf
@@ -15,21 +15,6 @@ Default
    FileMode 0664;
 }
 
-tree "dists/oldstable/updates"
-{
-   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)";
-   ExtraOverride "override.lenny.extra.$(SECTION)";
-   SrcOverride "override.lenny.$(SECTION).src";
-   Contents " ";
-   Packages::Compress "gzip bzip2";
-   Sources::Compress "gzip bzip2";
-};
-
-
 tree "dists/stable/updates"
 {
    FileList "/srv/security-master.debian.org/dak-database/dists/stable_updates/$(SECTION)_binary-$(ARCH).list";

diff --git a/config/debian-security/apt.conf.buildd b/config/debian-security/apt.conf.buildd
index 336112fd3c823d8ae0d36100c8cad07fd68a27a2..9647c635cb3e523c2b2baa76fe30f72589dc15e5 100644 (file)
--- a/config/debian-security/apt.conf.buildd
+++ b/config/debian-security/apt.conf.buildd
@@ -15,19 +15,6 @@ Default
    FileMode 0664;
 }
 
-bindirectory "lenny"
-{
-   Packages "lenny/Packages";
-   Sources "lenny/Sources";
-   Contents " ";
-
-   BinOverride "override.lenny.all3";
-   SrcOverride "override.lenny.all3.src";
-   BinCacheDB "packages-accepted-lenny.db";
-   PathPrefix "";
-   Packages::Extensions ".deb .udeb";
-};
-
 bindirectory "squeeze"
 {
    Packages "squeeze/Packages";

diff --git a/config/debian-security/cron.buildd b/config/debian-security/cron.buildd
index 1b60593ddeec922e2d4274f2ec4ed599da16cf24..970a232263f3e9a8d9307db7ff1c6dccda37bd33 100755 (executable)
--- a/config/debian-security/cron.buildd
+++ b/config/debian-security/cron.buildd
@@ -40,9 +40,6 @@ if [ ! -z "${dists}" ]; then
     trap 'kill -TERM $SSH_PID' 0
     for d in ${dists}; do
         case ${d} in
-            oldstable)
-                send=lenny
-                ;;
             stable)
                 send=squeeze
                 ;;

diff --git a/config/debian-security/cron.daily b/config/debian-security/cron.daily
index ba1d11ee8aced36ac17ab4a5b71e6b8953a015d8..3c34d769ec2bea6d1abccf73910ef2aff5aae791 100755 (executable)
--- a/config/debian-security/cron.daily
+++ b/config/debian-security/cron.daily
@@ -22,7 +22,6 @@ find . -maxdepth 1 -mindepth 1 -type l | xargs --no-run-if-empty rm
 
 for suite in $suites; do
     case $suite in
-        oldstable) override_suite=lenny;;
         stable) override_suite=squeeze;;
         testing) override_suite=wheezy;;
         *) echo "Unknown suite type ($suite)"; exit 1;;
@@ -50,7 +49,7 @@ for suite in $suites; do
 done
 
 # Generate .all3 overides for the buildd support
-for dist in lenny squeeze wheezy; do
+for dist in 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 aa729c37675f667200cda973df0337ecd2921b95..c5ad1ca1ca4bcb2cb36a3096a353c10e831a6ce6 100644 (file)
--- a/config/debian-security/dak.conf
+++ b/config/debian-security/dak.conf
@@ -126,25 +126,6 @@ Suite
   // Priority determines which suite is used for the Maintainers file
   // as generated by 'dak make-maintainers' (highest wins).
 
-  OldStable
-  {
-       Components 
-       {
-         updates/main;
-         updates/contrib;
-         updates/non-free;
-       };
-       Announce "dak@security.debian.org";
-       Version "";
-       Origin "Debian";
-       Label "Debian-Security";
-       Description "Debian 5.0 Security Updates";
-       ValidTime 864000; // 10 days
-       CodeName "lenny";
-       OverrideCodeName "lenny";
-       CopyDotDak "/srv/security-master.debian.org/queue/done/";
-  };
-
   Stable
   {
        Components
@@ -188,12 +169,8 @@ SuiteMappings
 {
  "silent-map stable-security stable";
  "silent-map oldstable-security oldstable";
- // JT - FIXME, hackorama
- // "silent-map testing-security stable";
   "silent-map etch-secure oldstable";
-  "silent-map lenny-secure stable";
   "silent-map testing-security testing";
-  "silent-map lenny-security oldstable";
   "silent-map squeeze-security stable";
   "silent-map wheezy-security testing";
 };

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 797409652e0855f738ae98a585b55cec0e4bc6a3..eff52392a0f81dfd655cc831a60b6c9214f4d713 100644 (file)
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -27,18 +27,6 @@ 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 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";
@@ -100,18 +88,6 @@ 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 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";

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 864ffd3407cca4012945dfaa58e64e1efaf26895..7c5d57f686f93f6ac0f1ecaa1c26b2735a2a1888 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -237,14 +237,11 @@ Suite
 
 SuiteMappings
 {
- "silent-map lenny-security oldstable-security";
  "silent-map squeeze-security stable-security";
  "silent-map wheezy-security testing-security";
  "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 oldstable";
- "map lenny-proposed-updates oldstable-proposed-updates";
  "map squeeze stable";
  "map squeeze-proposed-updates proposed-updates";
  "map squeeze-updates proposed-updates";

diff --git a/config/debian/dinstall.functions b/config/debian/dinstall.functions
index 8a5ec24e32c8ed8b12b18973221fba3519d26f9b..b7679dcfa50edd7b59abf82813ce9a0499f4410a 100644 (file)
--- a/config/debian/dinstall.functions
+++ b/config/debian/dinstall.functions
@@ -232,7 +232,7 @@ function mkmaintainers() {
 function copyoverrides() {
     log 'Copying override files into public view ...'
 
-    for ofile in ${overridedir}/override.{lenny,squeeze,wheezy,sid}.{,extra.}{main,contrib,non-free}*; do
+    for ofile in ${overridedir}/override.{squeeze,wheezy,sid}.{,extra.}{main,contrib,non-free}*; do
         bname=${ofile##*/}
         gzip -9cv --rsyncable ${ofile} > ${indices}/${bname}.gz
         chmod g+w ${indices}/${bname}.gz

diff --git a/dak/generate_packages_sources.py b/dak/generate_packages_sources.py
index e78466fc96de24dd8466804a5935a4ca1f9aa186..9b4526fedc60085e6ab16d9fc7c67c6097fd7abe 100755 (executable)
--- a/dak/generate_packages_sources.py
+++ b/dak/generate_packages_sources.py
@@ -106,45 +106,6 @@ TreeDefault
     apt_trees={}
     apt_trees["di"]={}
 
-    apt_trees["oldstable"]="""
-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 "%(arch)s";
-   BinOverride "override.lenny.$(SECTION)";
-   ExtraOverride "override.lenny.extra.$(SECTION)";
-   SrcOverride "override.lenny.$(SECTION).src";
-};
-"""
-
-    apt_trees["di"]["oldstable"]="""
-tree "dists/oldstable/main"
-{
-   FileList "/srv/ftp-master.debian.org/database/dists/oldstable_main_$(SECTION)_binary-$(ARCH).list";
-   Sections "debian-installer";
-   Architectures "%(arch)s";
-   BinOverride "override.lenny.main.$(SECTION)";
-   SrcOverride "override.lenny.main.src";
-   BinCacheDB "packages-debian-installer-$(ARCH).db";
-   Packages::Extensions ".udeb";
-   %(contentsline)s
-};
-
-tree "dists/oldstable/non-free"
-{
-   FileList "/srv/ftp-master.debian.org/database/dists/oldstable_non-free_$(SECTION)_binary-$(ARCH).list";
-   Sections "debian-installer";
-   Architectures "%(arch)s";
-   BinOverride "override.lenny.main.$(SECTION)";
-   SrcOverride "override.lenny.main.src";
-   BinCacheDB "packages-debian-installer-$(ARCH).db";
-   Packages::Extensions ".udeb";
-   %(contentsline)s
-};
-"""
-
     apt_trees["stable"]="""
 tree "dists/stable"
 {
@@ -366,33 +327,6 @@ tree "dists/proposed-updates/main"
    Contents " ";
 };
 """
-    apt_trees["oldstable-proposed-updates"]="""
-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 "%(arch)s";
-   BinOverride "override.lenny.$(SECTION)";
-   ExtraOverride "override.lenny.extra.$(SECTION)";
-   SrcOverride "override.lenny.$(SECTION).src";
-   Contents " ";
-};
-"""
-    apt_trees["di"]["oldstable-proposed-updates"]="""
-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 "%(arch)s";
-   BinOverride "override.lenny.main.$(SECTION)";
-   SrcOverride "override.lenny.main.src";
-   BinCacheDB "packages-debian-installer-$(ARCH).db";
-   Packages::Extensions ".udeb";
-   Contents " ";
-};
-"""
-
     cnf = Config()
     try:
         # Write apt.conf

diff --git a/dak/show_deferred.py b/dak/show_deferred.py
index 7352f71ea928d6bec94ee0b9654d339b174fa3f1..f9f24d6f217e0dcca74e3d292ab59b6ecc7c5bc5 100755 (executable)
--- a/dak/show_deferred.py
+++ b/dak/show_deferred.py
@@ -24,12 +24,7 @@ import sys, os, re, time
 import apt_pkg
 import rrdtool
 
-try:
-    # starting with squeeze
-    from debian import deb822
-except:
-    # up to lenny
-    from debian_bundle import deb822
+from debian import deb822
 
 from daklib.dbconn import *
 from daklib import utils

diff --git a/tools/gen-emails.pl b/tools/gen-emails.pl
index cde1dd3af0059e3558a7724f3054030b577e9546..50584fb13c32c5d5f35373187d87ce6d5f0041f5 100755 (executable)
--- a/tools/gen-emails.pl
+++ b/tools/gen-emails.pl
@@ -36,7 +36,7 @@ my $sth = $dbh->prepare( "
                maintainer
        WHERE   source.id = source_suite.src
        AND     source.changedby = maintainer.id
-       AND     ( suite_name = 'lenny-backports' or suite_name = 'squeeze-backports' )
+       AND     ( suite_name = 'squeeze-backports' )
        GROUP BY source.source,maintainer.name;
 ");