Merge commit 'origin/master' into debian-master

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 361bf70ff1a449e336088284936170880260bc63..7db02b6e658b291038389eb1d35a813b86fc9f52 100644 (file)
--- a/config.sh.sed.in
+++ b/config.sh.sed.in
@@ -20,7 +20,7 @@ cachedir=${topdir}/cache
 # 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

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 4c3c31fc8beabf44c9c055a2be5eec9502968475..9639e92deff877d4f344385e1d1b81a4ee295977 100755 (executable)
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -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;

diff --git a/templates/config.tmpl b/templates/config.tmpl
index 6fb12e0c8e214cb5f4cd88e8d969e806de646451..74a561277c24e09ffc2520403d2135e228070d11 100644 (file)
--- a/templates/config.tmpl
+++ b/templates/config.tmpl
@@ -4,7 +4,7 @@
 
    organisation = 'Debian'
    homepage = 'http://www.debian.org/'
-   packages_homepage = 'http://packages.debian.net/'
+   packages_homepage = 'http://packages.debian.org/'
    searchformurl = packages_homepage
    search_url = '/'
    tags_url = 'http://debtags.alioth.debian.org/'
@@ -42,6 +42,6 @@
 -%]
 [%-
    # possible values for importance: high, normal, low
-   sitewidemsg = { importance => "high",
-                  txt => "Please note that this is an experimental version of <a href=\"http://packages.debian.org/\">packages.debian.org</a>. Errors and obsolete information should be expected" }
+#   sitewidemsg = { importance => "high",
+#                 txt => "Please note that this is an experimental version of <a href=\"http://packages.debian.org/\">packages.debian.org</a>. Errors and obsolete information should be expected" }
 -%]

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index a9ef33870b80d68ce9a7db15445ea6a33e16d7b9..a9ed93b5370323135094fd49b859c956c5b96ebe 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -322,6 +322,6 @@ Do not install it on a normal Debian system.</p>
   [%- END %]
 [% END %]
 
-<script type="text/javascript">init_tab_list("ptablist")</script>
+[%# <script type="text/javascript">init_tab_list("ptablist")</script> %]
 
 [%- PROCESS 'html/foot.tmpl' -%]