r8487 - /man-cgi/man.cgi

[jfs@users.alioth.debian.org]

Author: jfs
Date: Tue Feb  8 22:19:27 2011
New Revision: 8487

URL: http://svn.debian.org/wsvn/?sc=1&rev=8487
Log:
Update the manpages CGI script for the new release (6.0) and add additional aliases
for the release codename. Since the releases now have additional subdirs (-proposed-updates
and -updates) which might have manpages add this to the manlocaldir definition.

Also, do not use the name of the server within the script but always use the variable
defined in the top of the script.

Modified:
    man-cgi/man.cgi

Modified: man-cgi/man.cgi
URL: http://svn.debian.org/wsvn/man-cgi/man.cgi?rev=8487&op=diff
==============================================================================
--- man-cgi/man.cgi (original)
+++ man-cgi/man.cgi Tue Feb  8 22:19:27 2011
@@ -119,7 +119,7 @@
 
 $manLocalDir = '/srv/manpages.debian.org/extractor/manpages-dists';
 #$manPathDefault = 'Debian Sid';
-$manPathDefault = 'Debian 5.0 lenny';
+$manPathDefault = 'Debian 6.0 squeeze';
 
 %locales =
    ( 
@@ -197,15 +197,17 @@
 	'thai',  'th_TH.TIS-620',
 	'turkish',  'tr_TR.ISO-8859-9',
 );
+
 %manPath = 
     (
         'Debian 3.0 woody',     "$manLocalDir/woody/usr/share/man:$manLocalDir/woody/usr/X11R6/man",
         'Debian 3.1 sarge',     "$manLocalDir/sarge/usr/share/man",
         'Debian 4.0 etch',      "$manLocalDir/etch/usr/share/man",
-        'Debian 5.0 lenny',     "$manLocalDir/lenny/usr/share/man",
-        'Debian squeeze',       "$manLocalDir/squeeze/usr/share/man",
+        'Debian 5.0 lenny',     "$manLocalDir/lenny/usr/share/man:$manLocalDir/lenny-proposed-updates/usr/share/man",
+        'Debian 6.0 squeeze',   "$manLocalDir/squeeze/usr/share/man:$manLocalDir/squeeze-proposed-updates/usr/share/man:$manLocalDir/squeeze-updates/usr/share/man",
+        'Debian testing (wheezy)',   "$manLocalDir/wheezy/usr/share/man",
         'Debian experimental',  "$manLocalDir/experimental/usr/share/man",
-        'Debian Sid',           "$manLocalDir/sid/usr/share/man",
+        'Debian unstable (sid)',           "$manLocalDir/sid/usr/share/man",
 );
 
 # delete non-existing releases
@@ -224,11 +226,14 @@
 # keywords must be in lower cases.
 %manPathAliases = 
     (
-        'debian', 'Debian 5.0 lenny',
-        'stable', 'Debian 5.0 lenny',
-        'testing', 'Debian squeeze',
+        'debian', 'Debian 6.0 squeeze',
+        'stable', 'Debian 6.0 squeeze',
+        'lenny', 'Debian 5.0 lenny',
+        'testing', 'Debian testing (wheezy)',
+        'wheezy', 'Debian testing (wheezy)',
         'experimental', 'Debian experimental',
-        'unstable', 'Debian Sid',
+        'unstable', 'Debian unstable (sid)',
+        'sid', 'Debian unstable (sid)',
 );
 
 foreach (sort keys %manPathAliases) {
@@ -272,7 +277,7 @@
     local($_, %form, $query, $proto, $name, $section, $apropos);
 
     # spinner is buggy, shit
-    local($u) = 'http://manpages.debian.net/cgi-bin/man.cgi';
+    local($u) = $www{'home'}.'/cgi-bin/man.cgi';
 	local($u)= $BASE;
 
     return &faq_output($u) if ($path =~ /\/(faq|help)\.html$/);