Merge branch 'master' into bpo

* master:
  one more squeeze
  its filenames, not filename
  Squeeze is now testing
  security stuff
  Also modified ddtp-i18n-check for squeeze
  i18n for squeeze
  Remove lenny-r0 specials
  Add security support for the lenny release
  First pass at lenny release branch
  url
  remove backwards-compatiblity stuff which is no longer needed

diff --combined config/debian/dak.conf
index 00f0bd1ab294f52450fc08bf7ea926180706ccd5,765e6e83417d3056f615f244c70cc3374f33d89c..dae2c9d987bba732c21e265b56d40cac9c89e5a8
--- 1/config/debian/dak.conf
--- 2/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@@ -35,14 -35,6 +35,14 @@@ Dinstal
       NoSourceOnly "true";
       ReleaseTransitions "/srv/ftp.debian.org/web/transitions.yaml";
     };
 +   // if you setup an own dak repository and want to upload Debian packages you most possibly want
 +   // to set the following option to a real path/filename and then enter those mail addresses that
 +   // you want to be able to receive mails generated by your dak installation. This avoids spamming
 +   // the real maintainers of a package you upload with mail.
 +   // format of entries: one entry per line. Either an email address directly, or a regular expression,
 +   // prefixed by "RE:". Examples: "jane.doe@domain.com" or "RE:jane[^@]@domain.com", where the first will
 +   // only allow to mail jane.doe@domain.com while the second will mail all of jane*@domain.com
 +   //  MailWhiteList "/some/path/to/a/file";
  };
  
  Transitions
@@@ -146,7 -138,7 +146,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
@@@ -199,7 -191,7 +199,7 @@@ Check-Override
  
  Suite
  {
-   Stable
+   OldStable
    {
        Components
        {
@@@ -231,6 -223,107 +231,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
        {
@@@ -254,6 -347,7 +355,7 @@@
          alpha;
          amd64;
          arm;
+           armel;
          hppa;
          i386;
          ia64;
@@@ -267,11 -361,11 +369,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";
@@@ -295,6 -389,7 +397,7 @@@
        UdebComponents
        {
          main;
+         non-free;
        };
    };
  
@@@ -312,7 -407,6 +415,6 @@@
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          i386;
@@@ -326,8 -420,8 +428,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
@@@ -351,7 -445,6 +453,6 @@@
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          i386;
@@@ -365,8 -458,8 +466,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";
@@@ -436,7 -529,6 +537,6 @@@
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          hurd-i386;
@@@ -486,7 -578,6 +586,6 @@@
          all;
          alpha;
          amd64;
-         arm;
          armel;
          hppa;
          hurd-i386;
@@@ -529,11 -620,11 +628,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";