From: James Troup <james@nocrew.org>
Date: Tue, 13 Feb 2007 14:01:42 +0000 (+0000)
Subject: [ajt] add udeb support for non-free (testing, unstable) and experimental
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c55e170c1f28d1bc94ef5c522badebf9214500c5;p=dak

[ajt] add udeb support for non-free (testing, unstable) and experimental
---

diff --git a/ChangeLog b/ChangeLog
index c59eeeeb..da2fc434 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2007-02-08  Anthony Towns  <ajt@debian.org>
 
+	* config/debian/apt.conf: add udeb support for non-free (testing,
+	unstable) and experimental.
+	* config/debian/dak.conf: likewise.
+
 	* dak/generate_releases.py (main): handle udebs in any component.
 
 	* daklib/queue.py (Upload.build_summaries): handle files without a
diff --git a/config/debian/apt.conf b/config/debian/apt.conf
index 8e9dbbe1..d27a545a 100644
--- a/config/debian/apt.conf
+++ b/config/debian/apt.conf
@@ -97,6 +97,18 @@ tree "dists/testing/main"
    Contents "$(DIST)/../Contents-udeb";
 };
 
+tree "dists/testing/non-free"
+{
+   FileList "/srv/ftp.debian.org/database/dists/testing_non-free_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
+   Architectures "alpha amd64 arm hppa i386 ia64 m68k mips mipsel powerpc s390 sparc";
+   BinOverride "override.etch.main.$(SECTION)";
+   SrcOverride "override.etch.main.src";
+   BinCacheDB "packages-debian-installer-$(ARCH).db";
+   Packages::Extensions ".udeb";
+   Contents "$(DIST)/../Contents-udeb-nf";
+};
+
 tree "dists/testing-proposed-updates/main"
 {
    FileList "/srv/ftp.debian.org/database/dists/testing-proposed-updates_main_$(SECTION)_binary-$(ARCH).list";
@@ -113,14 +125,50 @@ tree "dists/unstable/main"
 {
    FileList "/srv/ftp.debian.org/database/dists/unstable_main_$(SECTION)_binary-$(ARCH).list";
    Sections "debian-installer";
+   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc";
+   BinOverride "override.sid.main.$(SECTION)";
+   SrcOverride "override.sid.main.src";
+   BinCacheDB "packages-debian-installer-$(ARCH).db";
+   Packages::Extensions ".udeb";
+   Contents "$(DIST)/../Contents-udeb";
+};
+
+tree "dists/unstable/non-free"
+{
+   FileList "/srv/ftp.debian.org/database/dists/unstable_non-free_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
    Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
    BinOverride "override.sid.main.$(SECTION)";
    SrcOverride "override.sid.main.src";
    BinCacheDB "packages-debian-installer-$(ARCH).db";
    Packages::Extensions ".udeb";
+   Contents "$(DIST)/../Contents-udeb-nf";
+};
+
+tree "dists/experimental/main"
+{
+   FileList "/srv/ftp.debian.org/database/dists/experimental_main_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
+   Architectures "alpha amd64 arm hppa i386 ia64 mips mipsel m68k powerpc s390 sparc";
+   BinOverride "override.sid.main.$(SECTION)";
+   SrcOverride "override.sid.main.src";
+   BinCacheDB "packages-debian-installer-$(ARCH).db";
+   Packages::Extensions ".udeb";
    Contents "$(DIST)/../Contents-udeb";
 };
 
+tree "dists/experimental/non-free"
+{
+   FileList "/srv/ftp.debian.org/database/dists/experimental_non-free_$(SECTION)_binary-$(ARCH).list";
+   Sections "debian-installer";
+   Architectures "alpha amd64 arm hppa hurd-i386 i386 ia64 mips mipsel m68k powerpc s390 sparc";
+   BinOverride "override.sid.main.$(SECTION)";
+   SrcOverride "override.sid.main.src";
+   BinCacheDB "packages-debian-installer-$(ARCH).db";
+   Packages::Extensions ".udeb";
+   Contents "$(DIST)/../Contents-udeb-nf";
+};
+
 // Experimental
 
 tree "dists/experimental"
diff --git a/config/debian/dak.conf b/config/debian/dak.conf
index 7a6364bb..345607c4 100644
--- a/config/debian/dak.conf
+++ b/config/debian/dak.conf
@@ -350,6 +350,7 @@ Suite
 	UdebComponents
 	{
 	  main;
+	  non-free;
 	};
   };
 
@@ -406,6 +407,7 @@ Suite
 	UdebComponents
 	{
 	  main;
+	  non-free;
 	};
   };
 
@@ -454,6 +456,7 @@ Suite
 	UdebComponents
 	{
 	  main;
+	  non-free;
 	};
   };
 
@@ -502,7 +505,11 @@ Suite
 	    Unstable;
 	  };
 	};
-
+	UdebComponents
+	{
+	  main;
+	  non-free;
+	};
   };
 
 };