Merge branch 'master' into debian-master

diff --combined config.sh.sed.in
index 7feedbce79abbddd2ca932868056ffaa0ff617d1,111cabca2d4fbc4a584dc17e2bcd5d226fc7713c..9d02310d409a48bd9ca5f54d01430f3dbb537438
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -19,7 -19,7 +19,7 @@@ cachedir=${topdir}/cach
  # unset this if %SITE% moves somewhere where the packages files
  # cannot be obtained locally
  #
 -#localdir=/org/ftp.debian.org/debian
 +localdir=/org/ftp.root/debian
  
  # path to private ftp directory
  #ftproot=/org/ftp.root
@@@ -30,7 -30,7 +30,7 @@@ volatile_ftpsite=http://volatile.debian
  backports_ftpsite=http://backports.org/debian
  amd64_ftpsite=http://amd64.debian.net/debian
  debports_ftpsite=http://ftp.debian-ports.org/debian
- ddtp_ftpsite=http://ddtp.debian.net/debian
+ ddtp_ftpsite=
  
  wget_cmd="wget --no-verbose --tries=2 --timeout=60"
  check_release_cmd="perl -I${libdir} ${bindir}/check-release --verbose --ignoremissing --keyring ${configdir}/trusted.gpg"