Merge commit 'origin/master' into debian-master

diff --combined config.sh.sed.in
index 1c8658eca759592722fbf226bbd24827cc4cabd3,08ecd6189d9620979305765154b0e610d7f37202..0b298a0cc5a9a0b53c9dd7bc815a2e50ae1c281a
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -20,7 -20,7 +20,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
@@@ -31,13 -31,14 +31,14 @@@ volatile_ftpsite=http://volatile.debian
  backports_ftpsite=http://backports.org/debian
  amd64_ftpsite=http://amd64.debian.net/debian
  gnuab_ftpsite=http://kfreebsd-gnu.debian.net/debian
+ ddtp_ftpsite=http://ddtp.debian.net/debian
  
  root=""
  
  # Architectures
  #
  polangs="de fi nl fr uk"
- ddtplangs="de cs da eo es fi fr hu it ja nl pl pt_BR pt_PT ru sk sv_SE uk"
+ ddtplangs="ca cs da de eo es fi fr go hu it ja km_KH ko nl pl pt pt_BR ru sk sv uk zh zh_CN zh_TW"
  archives="us security amd64 gnuab backports volatile"
  sections="main contrib non-free"
  parts="$sections"

diff --combined lib/Packages/Dispatcher.pm
index 440b15971b5b60a3a6915e6aa6e2ea02cc72c43f,26437febcc1af7839a083924c562798fc6f25b0f..037f7f36ace8798d00da5cf2d23cf1edd3bd13d6
--- 1/lib/Packages/Dispatcher.pm
--- 2/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@@ -138,7 -138,7 +138,7 @@@ sub do_dispatch 
  
      my $what_to_do = 'show';
      my $source = 0;
 -    if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
 +    if (my $path = $ENV{'PATH_INFO'} || $input->param('PATH_INFO')) {
        my @components = grep { $_ } map { lc $_ } split /\/+/, $path;
  
        debug( "PATH_INFO=$path components=@components", 3) if DEBUG;
@@@ -314,7 -314,9 +314,9 @@@ Packages::CGI::init_url( $input, \%para
                                             debug => ( DEBUG ? $opts{debug} : 0 ) },
                                           ( $CACHEDIR ? { COMPILE_DIR => $CACHEDIR } : {} ) );
  
-     unless (-e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
+     #FIXME: ugly hack
+     unless (($what_to_do eq 'allpackages' and $opts{format} =~ /^(html|txt\.gz)/)
+             || -e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
        fatal_error( "requested format not available for this document",
                     "406 requested format not available");
      }