]> err.no Git - dak/commitdiff
New volatile implementation
authorMark Hymers <mhy@debian.org>
Sat, 18 Sep 2010 16:51:01 +0000 (16:51 +0000)
committerMark Hymers <mhy@debian.org>
Sat, 18 Sep 2010 16:51:01 +0000 (16:51 +0000)
Signed-off-by: Mark Hymers <mhy@debian.org>
config/debian/apt.conf
config/debian/dak.conf
daklib/.queue.py.swp [new file with mode: 0644]

index 733e6025bc50a25a564714fa6efa150147f1a6b7..9822577a277664c4d1f2f4d108cf3e04578efc95 100644 (file)
@@ -44,30 +44,6 @@ 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";
@@ -92,7 +68,7 @@ tree "dists/testing-proposed-updates"
    Contents " ";
 };
 
-tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile"
+tree "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";
@@ -104,18 +80,6 @@ tree "/srv/ftp-master.debian.org/ftp-testing/dists/squeeze-volatile"
    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";
index 648be641f49d898e5982613c92fa62f0470fb6c3..e50a5c7abfb0094504f7c53baa4cc695bc50179c 100644 (file)
@@ -255,67 +255,6 @@ 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
@@ -412,37 +351,6 @@ Suite
 
   };
 
-  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
diff --git a/daklib/.queue.py.swp b/daklib/.queue.py.swp
new file mode 100644 (file)
index 0000000..ae92668
Binary files /dev/null and b/daklib/.queue.py.swp differ