--- a/extra/NaN/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/extra/NaN/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,4 +1,5 @@
-Missing data statistics (not installed by default)
+nan >> Missing data statistics
+Missing data statistics
  coefficient_of_variation geomean meansq skewness
  covm cor cov corrcoef harmmean median statistic
  detrend kurtosis moment std mad naninsttest nantest 

--- a/extra/civil/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/extra/civil/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,3 +1,4 @@
+civil-engineering >> Civil Engineering
 Civil Engineering
  __nlnewmark_fcn__
  newmark nlnewmark

--- a/extra/engine/DESCRIPTION	Tue Oct 03 09:52:04 2006 +0000
+++ b/extra/engine/DESCRIPTION	Tue Oct 03 12:56:03 2006 +0000
@@ -5,7 +5,7 @@
 Maintainer: Paul Kienzle
 Title: Engine
 Description: An external interface library for Octave
-Categories: External
+Categories: engine, External
 Depends: octave (>= 2.9.7)
 License: GPL version 2 or later
 Url: http://octave.sf.net

--- a/extra/integration/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/extra/integration/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,3 +1,4 @@
+integration >> Integration
 Integration
  count cquadnd crule crule2d crule2dgen
  gquad gquad2d gquad2d6 gquad2dgen gquad6 gquadnd

--- a/extra/ode/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/extra/ode/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,4 +1,4 @@
-calculus >> Calculus
+ode >> Calculus
 Ordinary differential equations
  ode23 ode45 ode78
  penddot

--- a/extra/pdb/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/extra/pdb/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,3 +1,4 @@
+pdb >> Protein Database
 Protein Database
  read_pdb plotpdb 
  write_pdb

--- a/extra/soctcl/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/extra/soctcl/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,2 +1,3 @@
-tcl_octave
+tcl-octave >> TCl octave
+TCL
   tclphoto tclsend

--- a/extra/symband/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/extra/symband/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,4 +1,4 @@
-matrix >> Linear Algebra
+symband >> Linear Algebra
 Banded matrices
   BandToFull BandToSparse FullToBand
   SBBacksub SBEig SBFactor SBFactor2 SBProd SBSolve

--- a/extra/tk_octave/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/extra/tk_octave/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,4 +1,5 @@
-tk_octave
+tk-octave >> TK Octave
+TK
  tk_busy tk_busy_cancel
  tk_dialog tk_entry tk_error
  tk_init tk_input tk_cmd tk_end tk_interp

--- a/main/econometrics/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/main/econometrics/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,3 +1,4 @@
+econometrics >> Econometrics
 Econometrics
  average_moments delta_method 
  gmm_estimate gmm_example gmm_obj gmm_results gmm_variance gmm_variance_inefficient

--- a/main/fixed/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/main/fixed/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,4 +1,4 @@
-Fixedpoint >> Fixed Point Type
+fixed >> Fixed Point Type
 Fixed Point Operators
  + - = Addition/subtraction in a fixed point algebra.
  * / \ = Multiplication/division in fixed point (Division for scalars only).

--- a/main/gsl/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/main/gsl/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,4 +1,4 @@
-math >> Mathematics
+gsl >> Mathematics
 Special functions
  Chi
  Ci

--- a/main/ident/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/main/ident/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,3 +1,4 @@
+ident >> System Indentification
 System Indentification
  mktheta 
  poly2th 

--- a/main/irsa/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/main/irsa/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,4 +1,4 @@
-analysis >> Data analysis
+irsa >> Data analysis
 Irregular sampling analysis
  irsa_act irsa_actcore irsa_check
  irsa_dft irsa_dftfp irsa_genreal

--- a/main/miscellaneous/inst/edit.m	Tue Oct 03 09:52:04 2006 +0000
+++ b/main/miscellaneous/inst/edit.m	Tue Oct 03 12:56:03 2006 +0000
@@ -51,7 +51,7 @@
 ##   On cygwin, you will need to convert the cygwin path to a windows
 ##   path if you are using a native Windows editor.  For example
 ##   @example
-##     "C:/Program Files/Good Editor/Editor.exe" `cygpath -wa %s`
+##   "C:/Program Files/Good Editor/Editor.exe" `cygpath -wa %s`
 ##   @end example
 ##   @noindent
 ##   Pay attention to the "" and ``; they are significant.

--- a/main/octcdf/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/main/octcdf/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,3 +1,4 @@
+octcdf >> NetCDF 
 NetCDF 
  ncautonan
  ncautoscale

--- a/main/optim/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/main/optim/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,4 +1,4 @@
-optimization >> Optimization
+optim >> Optimization
 Minimization
  minimize 
  nelder_mead_min

--- a/main/parallel/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/main/parallel/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,4 +1,4 @@
-extra >> Extra packages
+parallel >> Parallel Computing
 Parallel
  send recv reval
  server getid pserver

--- a/nonfree/gpc/INDEX	Tue Oct 03 09:52:04 2006 +0000
+++ b/nonfree/gpc/INDEX	Tue Oct 03 12:56:03 2006 +0000
@@ -1,3 +1,4 @@
-General polygon clipper
+gpc >> General polygon clipper
+General polygon clipping
  gpc_clip gpc_create gpc_get gpc_is_polygon gpc_plot gpc_read
  gpc_tristrip gpc_write gpc_test

--- a/www/build-www.py	Tue Oct 03 09:52:04 2006 +0000
+++ b/www/build-www.py	Tue Oct 03 12:56:03 2006 +0000
@@ -36,7 +36,8 @@
             line = fid.readline();
         fid.close();
         return desc;
-    except:
+    except Exception, e:
+        print(e);
         print("Couldn't parse the DESCRIPTION file " + filename);
         raise
 
@@ -76,7 +77,8 @@
             return None;
         else:
             return None;
-    except:
+    except Exception, e:
+        print(e);
         print("Bad copy " + packdir);
         return None;
 
@@ -230,19 +232,20 @@
 
 def handle_package(packdir, outdir, p):
     if (os.path.isdir(packdir)):
-        if (not os.path.exists(packdir + "/NOINSTALL")):
-            if (os.path.exists(outdir)):
-                rm_rf(outdir);
-            os.mkdir(outdir);
-            try:
-                desc = create_index_html(packdir, outdir, p);
-                create_license_html(desc['name'], packdir, outdir);
-                return desc;
-            except:
-                rm_rf(outdir);
-                raise Exception("Can't create index.html");
-        else:
-            raise Exception("Package marked NOINSTALL");
+        #if (not os.path.exists(packdir + "/NOINSTALL")):
+        if (os.path.exists(outdir)):
+            rm_rf(outdir);
+        os.mkdir(outdir);
+        try:
+            desc = create_index_html(packdir, outdir, p);
+            create_license_html(desc['name'], packdir, outdir);
+            return desc;
+        except Exception, e:
+            print(e);
+            rm_rf(outdir);
+            raise Exception("Can't create index.html");
+        #else:
+        #    raise Exception("Package marked NOINSTALL");
     raise Exception('not packdir');
 
 def main():