Gah, apt is a piece of shit. Well, it expects the uncompressed

Packages files in the Release file to appear, so lets generate them.
Also make sure we dont have empty release files listed...

diff --git a/config/debian/apt.conf.buildd b/config/debian/apt.conf.buildd
index 2ad4483c2306be4e66161feec9f6d25f678c28e8..65a8363e74ec7f4046d57a1c89edfff3c9a36617 100644 (file)
--- a/config/debian/apt.conf.buildd
+++ b/config/debian/apt.conf.buildd
@@ -7,8 +7,8 @@ Dir
 
 Default
 {
-   Packages::Compress "bzip2 gzip";
-   Sources::Compress "bzip2 gzip";
+   Packages::Compress ". bzip2 gzip";
+   Sources::Compress ". bzip2 gzip";
    DeLinkLimit 0;
    FileMode 0664;
 }

diff --git a/config/debian/cron.unchecked b/config/debian/cron.unchecked
index f17331df70a1bf032795b33486f007da67791b56..406636ef65b0e0504e0c92bfdcae143c4420208c 100755 (executable)
--- a/config/debian/cron.unchecked
+++ b/config/debian/cron.unchecked
@@ -52,10 +52,11 @@ if lockfile -r3 $LOCKFILE; then
            cd $configdir
            apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate apt.conf.buildd
 
-           cd  ${incoming}/buildd
-           rm -f Release.*
-           apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd incoming" -o APT::FTPArchive::Release::Architectures="${archs}" release . > Release
+           cd  ${incoming}
+           rm -f buildd/Release*
+           apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="Debian" -o APT::FTPArchive::Release::Label="Debian" -o APT::FTPArchive::Release::Description="buildd incoming" -o APT::FTPArchive::Release::Architectures="${archs}" release buildd > Release
            gpg --secret-keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/secring.gpg --keyring /srv/ftp.debian.org/s3kr1t/dot-gnupg/pubring.gpg --no-options --batch --no-tty --armour --default-key 6070D3A1 --detach-sign -o Release.gpg Release 
+               mv Release* buildd/.
 
            cd ${incoming}
            mkdir -p tree/${STAMP}