X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=config%2Fdebian%2Fcommon;h=3ab47578d8a7715102b2f79b6109cf2827e7e5cb;hb=f83163576b3cd0267689b3102f846e6203c947b2;hp=a2f2877a14932713145539cc2a148e4233638ae0;hpb=38d6fa647e0f9bfcfb60c219ba52473793e3396c;p=dak.git

diff --git a/config/debian/common b/config/debian/common
index a2f2877a..3ab47578 100644
--- a/config/debian/common
+++ b/config/debian/common
@@ -38,32 +38,34 @@ function make_buildd_dir () {
     dak generate-releases -a build-queues
 
     for suite in unstable experimental; do
-	rm -rf "$incoming/dists/$suite/buildd"
-	dak export-suite -s "buildd-$suite" -d "$incoming/dists/$suite/buildd"
+        rm -rf "$incoming/dists/$suite/buildd"
+        dak export-suite -s "buildd-$suite" -d "$incoming/dists/$suite/buildd"
     done
+    rm -f ${incoming}/public/*
+    dak export-suite -s "accepted" -d "$incoming/public"
 
     # export to old build queue directories
     # XXX: Remove once the buildds use the version generated above.
     for suite in $(ls -1 $incoming/dists/); do
         # Skip project trace directory
         if [ "${suite}x" = "projectx" ]; then continue; fi
-        cd ${incoming}/dists/${dist}/buildd
-
-	dpkg-scanpackages . $overridedir/override.sid.all3 >Packages
-	gzip -9c --rsyncable <Packages >Packages.gz
-	dpkg-scansources . $override/override.sid.all3.src >Sources
-	gzip -9c --rsyncable <Sources >Sources.gz
-
-	rm -f buildd/Release
-	cd ..
-	apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $suite incoming" -o APT::FTPArchive::Release::Architectures="$archs" release buildd >Release
-	if [ "$suite" = "experimental" ]; then
-	    echo "NotAutomatic: yes" >>Release
-	fi
+        cd ${incoming}/dists/${suite}/buildd
+
+        apt-ftparchive packages . $overridedir/override.sid.all3 >Packages
+        gzip -9c --rsyncable <Packages >Packages.gz
+        apt-ftparchive sources . $overridedir/override.sid.all3.src >Sources
+        gzip -9c --rsyncable <Sources >Sources.gz
+
+        rm -f buildd/Release
+        cd ..
+        apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd $suite incoming" -o APT::FTPArchive::Release::Architectures="$archs" release buildd >Release
+        if [ "$suite" = "experimental" ]; then
+            echo "NotAutomatic: yes" >>Release
+        fi
 
-	gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o Release.gpg Release
+        gpg --secret-keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp-master.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 473041FA --detach-sign -o Release.gpg Release
 
-	mv Release Release.gpg buildd/
+        mv Release Release.gpg buildd/
     done
 
     for dist in $(ls -1 ${incoming}/dists/); do