Merge commit 'mhy/lenny-prepare' into merge

* commit 'mhy/lenny-prepare':
  Add security support for the lenny release
  First pass at lenny release branch
  remove backwards-compatiblity stuff which is no longer needed

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

diff --combined config/debian/dak.conf
index d1db68cbf0a320a08e276030e1e4f247e78b32cc,26dc140b11153063e4c26919642913b14aed96e2..765e6e83417d3056f615f244c70cc3374f33d89c
--- 1/config/debian/dak.conf
--- 2/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@@ -138,7 -138,7 +138,7 @@@ Reject-Proposed-Update
  {
     StableRejector "the Stable Release Team";
     StableMail "debian-release@lists.debian.org";
 -   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r6/";
 +   MoreInfoURL "http://release.debian.org/stable/4.0/4.0r7/";
  };
  
  Import-LDAP-Fingerprints
@@@ -191,7 -191,7 +191,7 @@@ Check-Override
  
  Suite
  {
-   Stable
+   OldStable
    {
        Components
        {
@@@ -223,6 -223,107 +223,107 @@@
        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 +347,7 @@@
          alpha;
          amd64;
          arm;
+           armel;
          hppa;
          i386;
          ia64;
@@@ -259,11 -361,11 +361,11 @@@
        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 +389,7 @@@
        UdebComponents
        {
          main;
+         non-free;
        };
    };
  
@@@ -304,7 -407,6 +407,6 @@@
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          i386;
@@@ -318,8 -420,8 +420,8 @@@
        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 +445,6 @@@
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          i386;
@@@ -357,8 -458,8 +458,8 @@@
        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 +529,6 @@@
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          hurd-i386;
@@@ -478,7 -578,6 +578,6 @@@
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          hurd-i386;
@@@ -521,11 -620,11 +620,11 @@@
  
  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";