Merge branch 'master' into show-new

diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 73b511ee548cde05f4500da3627173aa5bc6ad75..733e6025bc50a25a564714fa6efa150147f1a6b7 100644 (file)
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -44,6 +44,30 @@ tree "dists/proposed-updates"
    Contents " ";
 };
 
+tree "/srv/ftp-master.debian.org/ftp-testing/dists/lenny-volatile"
+{
+   FileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile_$(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 "/srv/ftp-master.debian.org/ftp-testing/dists/lenny-volatile-proposed-updates"
+{
+   FileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/lenny-volatile-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/testing"
 {
    FakeDI "dists/unstable";
@@ -68,6 +92,30 @@ tree "dists/testing-proposed-updates"
    Contents " ";
 };
 
+tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile"
+{
+   FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile_$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "amd64 armel hppa 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 "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile-proposed-updates"
+{
+   FileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile-proposed-updates_$(SECTION)_binary-$(ARCH).list";
+   SourceFileList "/srv/ftp-master.debian.org/database/dists/squeeze-volatile-proposed-updates_$(SECTION)_source.list";
+   Sections "main contrib non-free";
+   Architectures "amd64 armel hppa 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/unstable"
 {
    FileList "/srv/ftp-master.debian.org/database/dists/unstable_$(SECTION)_binary-$(ARCH).list";

diff --git a/config/debian/cron.dinstall b/config/debian/cron.dinstall
index 7b1a2f2a7a5aaa8f1bc16082989907bd410d5f47..05bc9e8233cc8c51e4613ff9fed9c95bbfe2d7ae 100755 (executable)
--- a/config/debian/cron.dinstall
+++ b/config/debian/cron.dinstall
@@ -193,7 +193,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="i18n1"
@@ -201,7 +201,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 lockfile "$LOCK_ACCEPTED"
 lockfile "$LOCK_NEW"
@@ -265,7 +265,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 GO=(
     FUNC="overrides"
@@ -281,7 +281,7 @@ GO=(
     ARGS=""
     ERR="false"
 )
-stage $GO &
+stage $GO
 
 state "packages/contents"
 GO=(

diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 16120d8eb9dcefa8be65057feab9df069551fa50..1411f62a2e6f302e2f72b56bb6b93be8bd3c9171 100644 (file)
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -125,7 +125,7 @@ Rm
    };
 
    MyEmailAddress "Debian Archive Maintenance <ftpmaster@ftp-master.debian.org>";
-   LogFile "/srv/ftp-master.debian.org/web/removals.txt";
+   LogFile "/srv/ftp.debian.org/web/removals.txt";
    Bcc "removed-packages@qa.debian.org";
 };
 
@@ -268,6 +268,67 @@ Suite
        };
   };
 
+  Lenny-Volatile
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Announce "debian-changes@lists.debian.org";
+       Origin "Debian";
+       Description "Volatile Packages for Debian 5.0";
+       CodeName "lenny-volatile";
+       OverrideCodeName "lenny";
+       OverrideSuite "stable";
+       ValidTime 604800; // 7 days
+       NotAutomatic "yes";
+       Priority "0";
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           Stable;
+         };
+         Enhances
+      {
+           Stable;
+         };
+       };
+
+  };
+
+  Lenny-Volatile-Proposed-Updates
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Announce "debian-changes@lists.debian.org";
+       Origin "Debian";
+       Description "Proposed Volatile Packages for Debian 5.0";
+       CodeName "lenny-volatile-proposed-updates";
+       OverrideCodeName "lenny";
+       OverrideSuite "stable";
+       ValidTime 604800; // 7 days
+       NotAutomatic "yes";
+       Priority "0";
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           Stable;
+         };
+         Enhances
+      {
+           Stable;
+         };
+       };
+  };
+
   Testing
   {
        Components
@@ -332,6 +393,69 @@ Suite
        };
   };
 
+  Squeeze-Volatile
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Announce "debian-testing-changes@lists.debian.org";
+       Origin "Debian";
+       Description "Volatile Packages for Debian x.y (testing)";
+       CodeName "squeeze-volatile";
+       OverrideCodeName "squeeze";
+       OverrideSuite "testing";
+       ValidTime 604800; // 7 days
+       NotAutomatic "yes";
+       Priority "0";
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           Stable;
+           Testing;
+         };
+         Enhances
+      {
+           Testing;
+         };
+       };
+
+  };
+
+  Squeeze-Volatile-Proposed-Updates
+  {
+       Components
+       {
+         main;
+         contrib;
+         non-free;
+       };
+       Announce "debian-testing-changes@lists.debian.org";
+       Origin "Debian";
+       Description "Proposed Volatile Packages for Debian x.y (testing)";
+       CodeName "squeeze-volatile-proposed-updates";
+       OverrideCodeName "squeeze";
+       OverrideSuite "testing";
+       ValidTime 604800; // 7 days
+       NotAutomatic "yes";
+       Priority "0";
+       VersionChecks
+       {
+         MustBeNewerThan
+         {
+           Stable;
+           Testing;
+         };
+         Enhances
+      {
+           Testing;
+         };
+       };
+  };
+
   Unstable
   {
        Components
@@ -409,7 +533,9 @@ SuiteMappings
  "propup-version stable-security testing testing-proposed-updates unstable";
  "propup-version testing-security unstable";
  "map lenny stable";
+ "map lenny-volatile lenny-volatile-proposed-updates";
  "map squeeze testing";
+ "map squeeze-volatile squeeze-volatile-proposed-updates";
  "map sid unstable";
  "map rc-buggy experimental";
 // "map oldstable oldstable-proposed-updates";
@@ -469,6 +595,9 @@ Dir
     Byhand "/srv/ftp-master.debian.org/queue/byhand/";
     ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
     OldProposedUpdates "/srv/ftp-master.debian.org/queue/o-p-u-new/";
+    ProposedUpdates "/srv/ftp-master.debian.org/queue/p-u-new/";
+    Lenny-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/lenny-volatile-p-u-new";
+    Squeeze-Volatile-Proposed-Updates "/srv/ftp-master.debian.org/queue/volatile/squeeze-volatile-p-u-new";
     Done "/srv/ftp-master.debian.org/queue/done/";
     Holding "/srv/ftp-master.debian.org/queue/holding/";
     New "/srv/ftp-master.debian.org/queue/new/";