Merge remote branch 'ftpmaster/master'

config/debian/common

@@ -36,6 +36,8 @@ function make_buildd_dir () {
     dak manage-build-queues -a
 
     for dist in $(ls -1 ${incoming}/dists/); do
+        # Skip project trace directory
+        if [ "${dist}x" = "projectx" ]; then continue; fi
         cd ${incoming}/dists/${dist}
         mkdir -p tree/${STAMP}
         cp -al ${incoming}/dists/${dist}/buildd/. tree/${STAMP}/

setup/README

@@ -16,9 +16,8 @@ The following roles are assumed to exist:
 For the purposes of this document, we'll be working in /srv/dak
 
 Set up the dak user on both the system and in postgres:
-# sudo adduser dak
-# sudo addgroup ftpmaster
-# sudo addgroup dak ftpmaster
+# sudo addgroup --system ftpmaster
+# sudo adduser --system dak --ingroup ftpmaster --shell /bin/bash
 # sudo -u postgres createuser -s dak
 
 Set up the dak directory: