From: Frank Lichtenheld <frank@lichtenheld.de>
Date: Mon, 3 Sep 2007 23:56:07 +0000 (+0000)
Subject: Merge commit 'origin/master' into debian-master
X-Git-Url: https://git.deb.at/?a=commitdiff_plain;h=793567cde5620b1197615e324e804458b0564ac8;hp=4cb36e543bb889e040b1c95b6d697582e28eeec2;p=deb%2Fpackages.git

Merge commit 'origin/master' into debian-master
---

diff --git a/config.sh.sed.in b/config.sh.sed.in
index 361bf70..7db02b6 100644
--- 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 4c3c31f..9639e92 100755
--- 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 6fb12e0..74a5612 100644
--- 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 a9ef338..a9ed93b 100644
--- 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' -%]