import various post-release changes

[wannabuild.git] / triggers / trigger.debian-buildd

diff --git a/triggers/trigger.debian-buildd b/triggers/trigger.debian-buildd
index e7f9980ef2c25bc2a87657dcade7d3e902f16511..0bee1705ace15c16b398a58806e3976f37597a4b 100755 (executable)
--- a/triggers/trigger.debian-buildd
+++ b/triggers/trigger.debian-buildd
@@ -26,9 +26,10 @@ main() {
     sync.sh $ARCHIVE nolock
 
     # Handle unstable as a normal suite.
-    suite=unstable
+    suite=sid
     SOURCES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/source/Sources.gz"
-    SOURCES="${SOURCES} ${ARCHIVE_BASE}/buildd-${suite}/Sources.gz"
+    filter_out_nonfree "${ARCHIVE_BASE}/buildd-${suite}/Sources.gz" "Sources.${suite}.incoming-filtered.gz"
+    SOURCES="${SOURCES} Sources.${suite}.incoming-filtered.gz"
     PACKAGES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
     PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/archive/${suite}/main/debian-installer/binary-%ARCH%/Packages.gz"
     PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/buildd-${suite}/Packages.gz"
@@ -36,9 +37,10 @@ main() {
 
     # Handle experimental as an overlay suite.
     suite=experimental
-    base_suite=unstable
+    base_suite=sid
     SOURCES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/source/Sources.gz"
-    SOURCES="${SOURCES} ${ARCHIVE_BASE}/buildd-${suite}/Sources.gz"
+    filter_out_nonfree "${ARCHIVE_BASE}/buildd-${suite}/Sources.gz" "Sources.${suite}.incoming-filtered.gz"
+    SOURCES="${SOURCES} Sources.${suite}.incoming-filtered.gz"
     PACKAGES="${ARCHIVE_BASE}/archive/${suite}/{main,contrib}/binary-%ARCH%/Packages.gz"
     PACKAGES="${PACKAGES} ${ARCHIVE_BASE}/buildd-${suite}/Packages.gz"