Merge commit 'origin/master' into debian-master

diff --combined config.sh.sed.in
index 7db02b6e658b291038389eb1d35a813b86fc9f52,aecefa9f307b893002d963eb822bc81975814ab0..1c8658eca759592722fbf226bbd24827cc4cabd3
--- 1/config.sh.sed.in
--- 2/config.sh.sed.in
+++ b/config.sh.sed.in
@@@ -20,13 -20,12 +20,12 @@@ 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
  
  ftpsite=http://ftp.de.debian.org/debian
- nonus_ftpsite=http://ftp.uk.debian.org/debian-non-US
  security_ftpsite=http://security.debian.org/debian-security
  volatile_ftpsite=http://volatile.debian.org/debian-volatile
  backports_ftpsite=http://backports.org/debian

diff --combined lib/Packages/Dispatcher.pm
index 9639e92deff877d4f344385e1d1b81a4ee295977,aad1d576872deae6ead2cff360112f0fa6106b07..440b15971b5b60a3a6915e6aa6e2ea02cc72c43f
--- 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;
@@@ -205,8 -205,6 +205,6 @@@
                    set_param_once( $input, \%params_set, 'archive', $_);
                } elsif (!$need_pkg && $sections_descs{$_}) {
                    set_param_once( $input, \%params_set, 'subsection', $_);
-               } elsif (!$need_pkg && ($_ eq 'non-us')) { # non-US hack
-                   set_param_once( $input, \%params_set, 'subsection', 'non-US');
                } elsif (!$need_pkg && ($_ eq 'source')) {
                    set_param_once( $input, \%params_set, 'source', 1);
                } elsif ($ARCHITECTURES{$_}) {

diff --combined templates/html/show.tmpl
index a9ed93b5370323135094fd49b859c956c5b96ebe,7107d53d80b302ca1c9fe5d261bfc409b7dadb8c..b524d47c176208902cc8ad69288b93d1e7f287d3
--- 1/templates/html/show.tmpl
--- 2/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@@ -45,7 -45,6 +45,6 @@@
  <h1>Package: [% pkg %] ([% versions.short %])
  [% END %]
  [%- PROCESS marker text=archive IF archive && archive != main_archive %]
- [%- PROCESS marker text=subsection IF subsection == 'non-US' and archive != 'non-US' %]
  [%- PROCESS marker text=section IF section && section != main_section %]
  [%- PROCESS marker text='essential' IF page.get_newest('essential') == 'yes' %]</h1>
  
@@@ -322,6 -321,6 +321,6 @@@ Do not install it on a normal Debian sy
    [%- END %]
  [% END %]
  
 -<script type="text/javascript">init_tab_list("ptablist")</script>
 +[%# <script type="text/javascript">init_tab_list("ptablist")</script> %]
  
  [%- PROCESS 'html/foot.tmpl' -%]