r36889 - in /packages/fenics/dolfin/trunk/debian: ./ cdbs/1/class/ patches/

johannr-guest at users.alioth.debian.org johannr-guest at users.alioth.debian.org
Mon Sep 13 09:57:59 UTC 2010


Author: johannr-guest
Date: Mon Sep 13 09:57:55 2010
New Revision: 36889

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36889
Log:
* New upstream release.
* Switch to CMake CDBS class:
  - Replace scons with cmake in Build-Depends and in Suggests for
    binary package dolfin-doc.
  - Add cmake to Depends field for binary package libdolfin0-dev.
  - Install CMake config file for DOLFIN with package libdolfin0-dev.
* debian/control:
  - Update version for python-ufc in Build-Depends field.
  - Update version for python-ufl in Depends field for binary package
    libdolfin0-dev.
  - Update version for ufc and python-ffc in Depends field for binary
    package libdolfin0-dev.
  - Bump Standards-Version to 3.9.1 (no changes needed).
* Add patches from upstream to help CMake find PETSc, SLEPc, and
  Trilinos and for installing some missing utilities (dolfin-convert
  and dolfin-order) and manual pages.
* Update debian/copyright and debian/copyright_hints.


Added:
    packages/fenics/dolfin/trunk/debian/dolfin-doc.install
    packages/fenics/dolfin/trunk/debian/patches/
    packages/fenics/dolfin/trunk/debian/patches/cmake_find_petsc_slepc.patch
    packages/fenics/dolfin/trunk/debian/patches/cmake_find_trilinos.patch
    packages/fenics/dolfin/trunk/debian/patches/install.patch
    packages/fenics/dolfin/trunk/debian/patches/series
Removed:
    packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons-vars.mk
    packages/fenics/dolfin/trunk/debian/cdbs/1/class/scons.mk
Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/control
    packages/fenics/dolfin/trunk/debian/copyright
    packages/fenics/dolfin/trunk/debian/copyright_hints
    packages/fenics/dolfin/trunk/debian/libdolfin0-dev.install
    packages/fenics/dolfin/trunk/debian/rules

Modified: packages/fenics/dolfin/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/changelog?rev=36889&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Mon Sep 13 09:57:55 2010
@@ -1,3 +1,25 @@
+dolfin (0.9.9-1) unstable; urgency=low
+
+  * New upstream release.
+  * Switch to CMake CDBS class:
+    - Replace scons with cmake in Build-Depends and in Suggests for
+      binary package dolfin-doc.
+    - Add cmake to Depends field for binary package libdolfin0-dev.
+    - Install CMake config file for DOLFIN with package libdolfin0-dev.
+  * debian/control:
+    - Update version for python-ufc in Build-Depends field.
+    - Update version for python-ufl in Depends field for binary package
+      libdolfin0-dev.
+    - Update version for ufc and python-ffc in Depends field for binary
+      package libdolfin0-dev.
+    - Bump Standards-Version to 3.9.1 (no changes needed).
+  * Add patches from upstream to help CMake find PETSc, SLEPc, and
+    Trilinos and for installing some missing utilities (dolfin-convert
+    and dolfin-order) and manual pages.
+  * Update debian/copyright and debian/copyright_hints.
+
+ -- Johannes Ring <johannr at simula.no>  Mon, 13 Sep 2010 11:45:17 +0200
+
 dolfin (0.9.8-3) unstable; urgency=low
 
   * Disable Trilinos on non-supported platforms (closes: #590100).

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=36889&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Mon Sep 13 09:57:55 2010
@@ -4,15 +4,15 @@
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Prud'homme <prudhomm at debian.org>, Johannes Ring <johannr at simula.no>
 Build-Depends: cdbs (>= 0.4.49), debhelper (>= 7), python-all-dev, 
- python-central (>= 0.5.6), scons, swig (>= 1.3.35), python-numpy, pkg-config,
+ python-central (>= 0.5.6), cmake (>= 2.8.0), swig (>= 1.3.35), python-numpy, pkg-config,
  libxml2-dev, libboost-dev, libboost-serialization-dev, libsuitesparse-dev,
- python-ufc (>= 1.4.1), libptscotch-dev, libpetsc3.1-dev | libpetsc3.0.0-dev,
+ python-ufc (>= 1.4.2), libptscotch-dev, libpetsc3.1-dev | libpetsc3.0.0-dev,
  libslepc3.0.0-dev (>= 3.0.0-p7.dfsg-7), libarmadillo-dev,
  libboost-filesystem-dev, libboost-program-options-dev,
  libtrilinos-dev[!armel !mips !mipsel !s390 !hppa !hurd-i386],
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, 
  texlive-math-extra, ghostscript
-Standards-Version: 3.8.4
+Standards-Version: 3.9.1
 XS-Python-Version: >= 2.5
 Homepage: http://www.fenics.org/wiki/DOLFIN
 DM-Upload-Allowed: yes
@@ -31,7 +31,7 @@
  libboost-serialization-dev, libsuitesparse-dev, python-dev, python-numpy,
  libptscotch-dev, libpetsc3.1-dev | libpetsc3.0.0-dev,
  libslepc3.0.0-dev (>= 3.0.0-p7.dfsg-7), libarmadillo-dev,
- python-ufl (>= 0.5.3-1),
+ python-ufl (>= 0.5.4-1), cmake (>= 2.8.0),
  libtrilinos-dev[!armel !mips !mipsel !s390 !hppa !hurd-i386],
  ${misc:Depends}
 Description: Shared links and header files for DOLFIN
@@ -58,7 +58,7 @@
 Conflicts: libdolfin
 Replaces: libdolfin
 Provides: libdolfin
-Depends: ufc (>= 1.4.1-1), python-ffc (>= 0.9.3-1), python-viper (>= 0.4.6-1),
+Depends: ufc (>= 1.4.2), python-ffc (>= 0.9.4), python-viper (>= 0.4.6-1),
  ${shlibs:Depends}, ${misc:Depends}
 Suggests: dolfin-doc, libdolfin0-dbg, python-dolfin
 Description: shared libraries for DOLFIN
@@ -105,7 +105,7 @@
 Section: doc
 Depends: libdolfin0-dev (>= ${source:Version}),
  python-dolfin (>= ${source:Version}), ${misc:Depends}
-Suggests: scons
+Suggests: cmake (>= 2.8.0)
 Description: Documentation and demo programs for DOLFIN
  DOLFIN is the C++/Python interface of FEniCS, providing a consistent PSE
  (Problem Solving Environment) for ordinary and partial differential equations.

Modified: packages/fenics/dolfin/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/copyright?rev=36889&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/copyright (original)
+++ packages/fenics/dolfin/trunk/debian/copyright Mon Sep 13 09:57:55 2010
@@ -10,16 +10,66 @@
 	   2003-2009, Johan Jansson <johanjan at math.chalmers.se>
 License: LGPL-2.1
 
-Files: demo/fem/assembly/cpp/ReactionDiffusion.ufl
-	demo/function/eval/cpp/Projection.ufl
-	demo/function/eval/cpp/main.cpp
-	demo/function/eval/python/demo.py
-	demo/function/projection-interpolation/python/demo.py
-	demo/ode/harmonic/cpp/main_solvedual.cpp
-	demo/pde/bcs/cpp/Poisson.ufl
-	demo/pde/bcs/cpp/main.cpp
-	demo/pde/bcs/python/demo.py
-	demo/pde/optimization/python/demo.py
+Files: bench/fem/speedup/cpp/Poisson.ufl
+	bench/fem/speedup/cpp/analyse-bench
+	bench/fem/speedup/cpp/assemble-poisson.cpp
+	bench/fem/speedup/cpp/solve-poisson.cpp
+	demo/undocumented/collection/cpp/main.cpp
+	demo/undocumented/reaction-diffusion/cpp/main.cpp
+	demo/undocumented/reaction-diffusion/python/demo.py
+	demo/undocumented/submesh/cpp/main.cpp
+	demo/undocumented/submesh/python/demo.py
+	demo/undocumented/time-series/cpp/main.cpp
+	demo/undocumented/time-series/python/demo.py
+	dolfin/adaptivity/Extrapolation.cpp
+	dolfin/adaptivity/Extrapolation.h
+	dolfin/adaptivity/TimeSeries.cpp
+	dolfin/adaptivity/TimeSeries.h
+	dolfin/common/utils.cpp
+	dolfin/common/utils.h
+	dolfin/fem/BasisFunction.h
+	dolfin/function/Data.cpp
+	dolfin/function/Data.h
+	dolfin/function/Expression.cpp
+	dolfin/function/Expression.h
+	dolfin/function/GenericFunction.cpp
+	dolfin/function/GenericFunction.h
+	dolfin/io/BinaryFile.cpp
+	dolfin/io/BinaryFile.h
+	dolfin/mesh/SubMesh.cpp
+	dolfin/mesh/SubMesh.h
+	dolfin/parameter/GlobalParameters.cpp
+	dolfin/parameter/GlobalParameters.h
+	dolfin/parameter/Parameter.cpp
+	dolfin/parameter/Parameter.h
+	dolfin/parameter/Parameters.cpp
+	dolfin/parameter/Parameters.h
+	dolfin/plot/FunctionPlotData.cpp
+	dolfin/plot/FunctionPlotData.h
+	dolfin/swig/fem_pre.i
+	site-packages/dolfin/fem/bcs.py
+	site-packages/dolfin/fem/interpolate.py
+	site-packages/dolfin/mesh/ale.py
+	site-packages/dolfin/mesh/refine.py
+	site-packages/dolfin_utils/commands.py
+	test/system/parallel-assembly-solve/solver.py
+	test/system/parallel-assembly-solve/test.py
+	test/system/test.py
+	test/unit/python-extras/python/test.py
+	utils/scripts/formatcode
+	utils/tetgen/dolfin-tetgen
+Copyright: 2009, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/assembly/cpp/ReactionDiffusion.ufl
+	demo/undocumented/bcs/cpp/Poisson.ufl
+	demo/undocumented/bcs/cpp/main.cpp
+	demo/undocumented/bcs/python/demo.py
+	demo/undocumented/eval/cpp/Projection.ufl
+	demo/undocumented/eval/cpp/main.cpp
+	demo/undocumented/eval/python/demo.py
+	demo/undocumented/optimization/python/demo.py
+	demo/undocumented/projection-interpolation/python/demo.py
 	dolfin/ale/HarmonicSmoothing.cpp
 	dolfin/ale/HarmonicSmoothing.h
 	dolfin/ale/Poisson1D.ufl
@@ -39,12 +89,12 @@
 	dolfin/mesh/DynamicMeshEditor.cpp
 	dolfin/mesh/DynamicMeshEditor.h
 	dolfin/mesh/MeshSmoothing.cpp
-	misc/utils/order/dolfin-order
-	misc/utils/python/extract2d
 	site-packages/dolfin/fem/errornorm.py
 	site-packages/dolfin/fem/norm.py
 	test/unit/function/cpp/Projection.form
 	test/unit/function/cpp/Projection.ufl
+	utils/order/dolfin-order
+	utils/python/extract2d
 Copyright: 2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -58,14 +108,13 @@
 	bench/fem/convergence/cpp/forms/Poisson3D_3.ufl
 	bench/fem/convergence/cpp/forms/Poisson3D_4.ufl
 	bench/fem/convergence/cpp/forms/Poisson3D_5.ufl
-	demo/fem/simple/cpp/MassMatrix3D.ufl
-	demo/fem/simple/cpp/StiffnessMatrix3D.ufl
-	demo/la/block-matrix/cpp/StiffnessMatrix.ufl
-	demo/la/eigensolver/cpp/StiffnessMatrix.ufl
-	demo/ode/complex/cpp/main.cpp
-	demo/pde/functional/cpp/EnergyNorm.ufl
-	dolfin/la/PETScKrylovMatrix.cpp
-	dolfin/la/PETScKrylovMatrix.h
+	demo/la/eigenvalue/cpp/StiffnessMatrix.ufl
+	demo/undocumented/block-matrix/cpp/StiffnessMatrix.ufl
+	demo/undocumented/complex/cpp/main.cpp
+	demo/undocumented/functional/cpp/EnergyNorm.ufl
+	demo/undocumented/simple/cpp/MassMatrix3D.ufl
+	demo/undocumented/simple/cpp/StiffnessMatrix3D.ufl
+	dolfin/la/PETScBaseMatrix.h
 	dolfin/la/PETScLUSolver.h
 	dolfin/main/init.cpp
 	dolfin/mesh/UnitCircle.h
@@ -84,122 +133,104 @@
 Copyright: 2005-2006, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: bench/fem/speedup/cpp/Poisson.ufl
-	bench/fem/speedup/cpp/analyse-bench
-	bench/fem/speedup/cpp/assemble-poisson.cpp
-	bench/fem/speedup/cpp/solve-poisson.cpp
-	demo/adaptivity/time-series/cpp/main.cpp
-	demo/adaptivity/time-series/python/demo.py
-	demo/mesh/submesh/cpp/main.cpp
-	demo/mesh/submesh/python/demo.py
-	demo/ode/collection/cpp/main.cpp
-	demo/pde/simple/cpp/main.cpp
-	demo/pde/simple/python/demo.py
-	demo/pde/tensor-weighted-poisson/python/demo.py
-	dolfin/adaptivity/AdaptiveObjects.cpp
-	dolfin/adaptivity/AdaptiveObjects.h
-	dolfin/adaptivity/Extrapolation.cpp
-	dolfin/adaptivity/Extrapolation.h
-	dolfin/adaptivity/TimeSeries.cpp
-	dolfin/adaptivity/TimeSeries.h
-	dolfin/common/utils.cpp
-	dolfin/common/utils.h
-	dolfin/fem/BasisFunction.h
-	dolfin/function/Data.cpp
-	dolfin/function/Data.h
-	dolfin/function/Expression.cpp
-	dolfin/function/Expression.h
-	dolfin/function/GenericFunction.cpp
-	dolfin/function/GenericFunction.h
-	dolfin/io/BinaryFile.cpp
-	dolfin/io/BinaryFile.h
-	dolfin/la/LAPACKMatrix.cpp
-	dolfin/la/LAPACKMatrix.h
-	dolfin/la/LAPACKSolvers.cpp
-	dolfin/la/LAPACKSolvers.h
-	dolfin/la/LAPACKVector.cpp
-	dolfin/la/LAPACKVector.h
-	dolfin/la/lapack.h
-	dolfin/mesh/SubMesh.cpp
-	dolfin/mesh/SubMesh.h
-	dolfin/parameter/GlobalParameters.cpp
-	dolfin/parameter/GlobalParameters.h
-	dolfin/parameter/Parameter.cpp
-	dolfin/parameter/Parameter.h
-	dolfin/parameter/Parameters.cpp
-	dolfin/parameter/Parameters.h
-	dolfin/plot/FunctionPlotData.cpp
-	dolfin/plot/FunctionPlotData.h
-	dolfin/swig/fem_pre.i
-	misc/utils/tetgen/dolfin-tetgen
-	scripts/formatcode
-	site-packages/dolfin/fem/interpolate.py
-	site-packages/dolfin/mesh/ale.py
-	site-packages/dolfin/mesh/bcs.py
-	site-packages/dolfin_utils/commands.py
-	test/system/parallel-assembly-solve/solver.py
-	test/system/parallel-assembly-solve/test.py
-	test/system/test.py
-	test/unit/python-extras/python/test.py
-	bench/fem/speedup/analyse-bench
-Copyright: 2009, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/la/uBLASDummyPreconditioner.cpp
-	dolfin/la/uBLASDummyPreconditioner.h
-	dolfin/la/uBLASKrylovMatrix.cpp
-	dolfin/la/uBLASKrylovMatrix.h
-	dolfin/mesh/Edge.cpp
-	dolfin/mesh/Face.cpp
-	dolfin/mesh/Facet.cpp
-	dolfin/mesh/MeshGeometry.cpp
-	dolfin/mesh/MeshGeometry.h
-	dolfin/mesh/TopologyComputation.h
-	dolfin/mesh/UniformMeshRefinement.h
-	misc/utils/convert/dolfin-convert
-	misc/utils/xml/convertall
-	site-packages/dolfin/mesh/meshconvert.py
-	test/unit/mesh/python/test.py
-Copyright: 2006, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/ode/aliev-panfilov/cpp/main.cpp
-	demo/pde/advection-diffusion/cpp/main.cpp
-	demo/pde/functional/cpp/main.cpp
-	demo/pde/stokes/stabilized/cpp/main.cpp
-	demo/pde/stokes/taylor-hood/cpp/main.cpp
-	dolfin/mesh/BoundaryComputation.cpp
-	dolfin/mesh/BoundaryComputation.h
-	dolfin/mesh/BoundaryMesh.cpp
-	dolfin/mesh/BoundaryMesh.h
-	dolfin/mesh/IntervalCell.cpp
-	dolfin/mesh/IntervalCell.h
-	dolfin/mesh/MeshEntityIterator.h
-	dolfin/mesh/Point.cpp
-	dolfin/mesh/Point.h
-	dolfin/mesh/TetrahedronCell.cpp
-	dolfin/mesh/TetrahedronCell.h
-	dolfin/mesh/TopologyComputation.cpp
-	dolfin/mesh/TriangleCell.cpp
-	dolfin/mesh/TriangleCell.h
-	dolfin/mesh/Vertex.h
-Copyright: 2006-2008, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: bench/mesh/iteration/cpp/main.cpp
-	bench/mesh/refinement/cpp/main.cpp
-	bench/mesh/unitcube/cpp/main.cpp
-	dolfin/mesh/TriangleCell.cpp
-	dolfin/mesh/UniformMeshRefinement.cpp
-	dolfin/mesh/UniformMeshRefinement.h
-Copyright: 2006-2010, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/pde/equality/cpp/Poisson.ufl
-	demo/pde/stokes/stabilized/cpp/Stokes.ufl
-	demo/pde/stokes/taylor-hood/cpp/Stokes.ufl
-	demo/pde/sym-dirichlet-bc/cpp/Poisson.ufl
-Copyright: 2005-2007, Anders Logg <logg at simula.no>
+Files: demo/la/eigenvalue/python/demo.py
+	demo/pde/mixed-poisson/python/demo.py
+	demo/undocumented/advection-diffusion/python/demo.py
+	demo/undocumented/aliev-panfilov/python/demo.py
+	demo/undocumented/dg-poisson/python/demo.py
+	demo/undocumented/elasticity/python/demo.py
+	demo/undocumented/functional/python/demo.py
+	demo/undocumented/lift-drag/python/demo.py
+	demo/undocumented/meshfunction/python/demo.py
+	demo/undocumented/nonlinear-poisson/python/demo.py
+	demo/undocumented/periodic/python/demo.py
+	demo/undocumented/poisson1D/cpp/Poisson.ufl
+	demo/undocumented/poisson1D/cpp/main.cpp
+	demo/undocumented/poisson1D/python/demo.py
+	demo/undocumented/quadrature/python/demo.py
+	demo/undocumented/simple/python/demo.py
+	demo/undocumented/stokes-mini/python/demo.py
+	demo/undocumented/stokes-stabilized/python/demo.py
+	demo/undocumented/stokes-taylor-hood/python/demo.py
+	demo/undocumented/subdomains/python/demo.py
+	dolfin/mesh/Interval.cpp
+	dolfin/mesh/Interval.h
+	dolfin/mesh/UnitInterval.h
+Copyright: 2007, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+License: LGPL-2.1
+
+Files: demo/undocumented/entityintersection/python/demo.py
+	demo/undocumented/meshintersection/3D/python/demo.py
+	dolfin/mesh/IntersectionOperator.cpp
+	dolfin/mesh/IntersectionOperator.h
+	dolfin/mesh/IntersectionOperatorImplementation.h
+	dolfin/mesh/MeshPrimitive.h
+	dolfin/mesh/Point_3_Bbox_3_intersection.h
+	dolfin/mesh/Point_3_Iso_Cuboid_3_intersection.h
+	dolfin/mesh/Point_3_Line_3_intersection.h
+	dolfin/mesh/Point_3_Point_3_intersection.h
+	dolfin/mesh/Point_3_Ray_3_intersection.h
+	dolfin/mesh/Point_3_Segment_3_intersection.h
+	dolfin/mesh/Point_3_Tetrahedron_3_intersection.h
+	dolfin/mesh/Point_3_Triangle_3_intersection.h
+	dolfin/mesh/PrimitiveTraits.h
+	dolfin/mesh/Segment_3_Segment_3_intersection.h
+	dolfin/mesh/Segment_3_Tetrahedron_3_intersection.h
+	dolfin/mesh/Tetrahedron_3_Bbox_3_intersection.h
+	dolfin/mesh/Tetrahedron_3_Tetrahedron_3_intersection.h
+	dolfin/mesh/Tree_Traits.h
+	dolfin/mesh/added_intersection_3.h
+	dolfin/swig/std_set_typemaps.i
+Copyright: 2009, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/io/XMLArray.cpp
+	dolfin/io/XMLArray.h
+	dolfin/io/XMLDolfin.cpp
+	dolfin/io/XMLDolfin.h
+	dolfin/io/XMLFile.cpp
+	dolfin/io/XMLFile.h
+	dolfin/io/XMLFunctionPlotData.cpp
+	dolfin/io/XMLHandler.cpp
+	dolfin/io/XMLHandler.h
+	dolfin/io/XMLIndent.cpp
+	dolfin/io/XMLIndent.h
+	dolfin/io/XMLMap.cpp
+	dolfin/io/XMLMap.h
+	dolfin/io/XMLMeshData.cpp
+	dolfin/io/XMLMeshData.h
+	dolfin/io/XMLMeshFunction.cpp
+	dolfin/io/XMLMeshFunction.h
+	dolfin/io/XMLSkipper.cpp
+	dolfin/io/XMLSkipper.h
+	dolfin/io/XMLVectorMapping.cpp
+	dolfin/io/XMLVectorMapping.h
+	dolfin/mesh/MeshFunction.cpp
+Copyright: 2009, Ola Skavhaug <skavhaug at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/lift-drag/cpp/main.cpp
+	demo/undocumented/periodic/cpp/main.cpp
+	demo/undocumented/plot/python/demo.py
+	demo/undocumented/subdomains/cpp/main.cpp
+	dolfin/fem/BoundaryCondition.cpp
+	dolfin/fem/BoundaryCondition.h
+	dolfin/fem/PeriodicBC.cpp
+	dolfin/fem/PeriodicBC.h
+	dolfin/fem/UFC.cpp
+	dolfin/fem/UFC.h
+	dolfin/la/GenericTensor.h
+	dolfin/la/STLMatrix.cpp
+	dolfin/la/STLMatrix.h
+	dolfin/la/Scalar.h
+	dolfin/la/solve.cpp
+	dolfin/la/solve.h
+	dolfin/mesh/MeshOrdering.h
+	dolfin/mesh/SubDomain.cpp
+	dolfin/mesh/SubDomain.h
+	site-packages/dolfin/fem/assemble.py
+	site-packages/dolfin/fem/variationalproblem.py
+Copyright: 2007-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
 Files: dolfin/mesh/Box.cpp
@@ -225,93 +256,13 @@
 Copyright: 2005-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: bench/fem/convergence/cpp/main.cpp
-	dolfin/common/timing.h
-Copyright: 2005-2010, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/fem/simple/python/demo.py
-	demo/la/eigensolver/python/demo.py
-	demo/mesh/meshfunction/python/demo.py
-	demo/mesh/subdomains/python/demo.py
-	demo/ode/aliev-panfilov/python/demo.py
-	demo/pde/advection-diffusion/python/demo.py
-	demo/pde/dg/poisson/python/demo.py
-	demo/pde/elasticity/python/demo.py
-	demo/pde/functional/python/demo.py
-	demo/pde/lift-drag/python/demo.py
-	demo/pde/mixed-poisson/python/demo.py
-	demo/pde/nonlinear-poisson/python/demo.py
-	demo/pde/periodic/python/demo.py
-	demo/pde/poisson1D/cpp/Poisson.ufl
-	demo/pde/poisson1D/cpp/main.cpp
-	demo/pde/poisson1D/python/demo.py
-	demo/pde/stokes/mini/python/demo.py
-	demo/pde/stokes/stabilized/python/demo.py
-	demo/pde/stokes/taylor-hood/python/demo.py
-	demo/quadrature/python/demo.py
-	dolfin/mesh/Interval.cpp
-	dolfin/mesh/Interval.h
-	dolfin/mesh/UnitInterval.h
-Copyright: 2007, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl>
-License: LGPL-2.1
-
-Files: demo/mesh/subdomains/cpp/main.cpp
-	demo/pde/lift-drag/cpp/main.cpp
-	demo/pde/periodic/cpp/main.cpp
-	demo/plot/python/demo.py
-	dolfin/fem/BoundaryCondition.cpp
-	dolfin/fem/BoundaryCondition.h
-	dolfin/fem/PeriodicBC.cpp
-	dolfin/fem/PeriodicBC.h
-	dolfin/fem/UFC.cpp
-	dolfin/fem/UFC.h
-	dolfin/la/GenericTensor.h
-	dolfin/la/STLMatrix.cpp
-	dolfin/la/STLMatrix.h
-	dolfin/la/Scalar.h
-	dolfin/la/solve.cpp
-	dolfin/la/solve.h
-	dolfin/mesh/MeshOrdering.h
-	dolfin/mesh/SubDomain.cpp
-	dolfin/mesh/SubDomain.h
-	site-packages/dolfin/fem/assemble.py
-	site-packages/dolfin/fem/variationalproblem.py
-Copyright: 2007-2008, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/io/XMLArray.cpp
-	dolfin/io/XMLArray.h
-	dolfin/io/XMLDolfin.cpp
-	dolfin/io/XMLDolfin.h
-	dolfin/io/XMLFile.cpp
-	dolfin/io/XMLFile.h
-	dolfin/io/XMLFunctionPlotData.cpp
-	dolfin/io/XMLHandler.cpp
-	dolfin/io/XMLHandler.h
-	dolfin/io/XMLIndent.cpp
-	dolfin/io/XMLIndent.h
-	dolfin/io/XMLMap.cpp
-	dolfin/io/XMLMap.h
-	dolfin/io/XMLMeshData.cpp
-	dolfin/io/XMLMeshData.h
-	dolfin/io/XMLMeshFunction.cpp
-	dolfin/io/XMLMeshFunction.h
-	dolfin/io/XMLSkipper.cpp
-	dolfin/io/XMLSkipper.h
-	dolfin/io/XMLVectorMapping.cpp
-	dolfin/io/XMLVectorMapping.h
-Copyright: 2009, Ola Skavhaug <skavhaug at simula.no>
-License: LGPL-2.1
-
-Files: demo/mesh/refinement/cpp/main.cpp
-	demo/pde/equality/cpp/main.cpp
-	demo/pde/poisson/cpp/main.cpp
+Files: demo/pde/poisson/cpp/main.cpp
+	demo/undocumented/equality/cpp/main.cpp
+	demo/undocumented/refinement/cpp/main.cpp
 	dolfin/function/Constant.cpp
 	dolfin/function/Constant.h
 	dolfin/function/SpecialFunctions.cpp
 	dolfin/function/SpecialFunctions.h
-	dolfin/mesh/Cell.h
 	dolfin/mesh/CellType.cpp
 	dolfin/mesh/CellType.h
 	dolfin/mesh/Mesh.cpp
@@ -328,96 +279,69 @@
 Copyright: 2006-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/mesh/intersection/entityintersection/python/demo.py
-	demo/mesh/intersection/meshintersection/3D/python/demo.py
-	dolfin/mesh/IntersectionOperator.cpp
-	dolfin/mesh/IntersectionOperator.h
-	dolfin/mesh/IntersectionOperatorImplementation.h
-	dolfin/mesh/MeshPrimitive.h
-	dolfin/mesh/Point_3_Bbox_3_intersection.h
-	dolfin/mesh/Point_3_Iso_Cuboid_3_intersection.h
-	dolfin/mesh/Point_3_Line_3_intersection.h
-	dolfin/mesh/Point_3_Point_3_intersection.h
-	dolfin/mesh/Point_3_Ray_3_intersection.h
-	dolfin/mesh/Point_3_Segment_3_intersection.h
-	dolfin/mesh/Point_3_Tetrahedron_3_intersection.h
-	dolfin/mesh/Point_3_Triangle_3_intersection.h
-	dolfin/mesh/PrimitiveTraits.h
-	dolfin/mesh/Segment_3_Segment_3_intersection.h
-	dolfin/mesh/Segment_3_Tetrahedron_3_intersection.h
-	dolfin/mesh/Tetrahedron_3_Bbox_3_intersection.h
-	dolfin/mesh/Tetrahedron_3_Tetrahedron_3_intersection.h
-	dolfin/mesh/Tree_Traits.h
-	dolfin/mesh/added_intersection_3.h
-	dolfin/swig/std_set_typemaps.i
-Copyright: 2009, André Massing <massing at simula.no>
-License: LGPL-2.1
-
-Files: demo/function/restriction/python/demo.py
-	demo/la/block-matrix/cpp/main.cpp
-	demo/la/block-matrix/python/demo.py
-	demo/pde/sym-dirichlet-bc/python/demo.py
-	demo/pde/sym-dirichlet-bc/python/dg-demo.py
-	demo/pde/sym-dirichlet-bc/python/dg-speed-up-test.py
-	demo/pde/sym-dirichlet-bc/python/speed-up-test.py
-	dolfin/la/BlockMatrix.cpp
-	dolfin/la/BlockMatrix.h
-	dolfin/la/BlockVector.cpp
-	dolfin/la/BlockVector.h
-	dolfin/la/EpetraKrylovSolver.cpp
-	dolfin/la/EpetraKrylovSolver.h
-	dolfin/la/EpetraLUSolver.h
-	dolfin/la/EpetraPreconditioner.cpp
-	dolfin/la/EpetraPreconditioner.h
-	site-packages/dolfin/mesh/boundarysubdomainfinder.py
-	test/unit/restriction/python/test.py
-	demo/la/trilinos/python/demo.py
-	demo/la/trilinos/python/demo2.py
-Copyright: 2008, Kent-Andre Mardal <kent-and at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/la/EpetraLUSolver.cpp
-Copyright: 2008-2010, Kent-Andre Mardal <kent-and at simula.no>
-	   2008-2010, Garth N. Wells <gnw20 at cam.ac.uk>
-
-Files: demo/ode/lorenz/cpp/main.cpp
-	demo/ode/stiff/cpp/TestProblem3.h
-	demo/ode/stiff/cpp/TestProblem7.h
-	dolfin/function/Function.h
-	dolfin/math/Lagrange.cpp
-	dolfin/math/Legendre.cpp
-	dolfin/ode/Dependencies.cpp
-	dolfin/ode/Dependencies.h
-	dolfin/ode/Dual.cpp
-	dolfin/ode/Dual.h
-	dolfin/ode/cGqMethod.cpp
-	dolfin/ode/cGqMethod.h
-	dolfin/ode/dGqMethod.cpp
-	dolfin/quadrature/GaussQuadrature.cpp
-Copyright: 2003-2008, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/common/timing.cpp
-	dolfin/log/Progress.cpp
-Copyright: 2003-2010, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/pde/advection-diffusion/cpp/AdvectionDiffusion.ufl
-	demo/pde/sym-dirichlet-bc/cpp/main.cpp
-	demo/plot/cpp/main.cpp
-	dolfin/mesh/Edge.h
-	dolfin/mesh/Face.h
-	dolfin/mesh/Facet.h
-	dolfin/mesh/MeshConnectivity.cpp
-	dolfin/mesh/MeshConnectivity.h
-	dolfin/mesh/MeshEntityIterator.cpp
-	dolfin/mesh/UniformMeshRefinement.cpp
-	test/unit/test.py
-Copyright: 2006-2007, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/ode/reaction/cpp/main.cpp
+Files: demo/undocumented/advection-diffusion/cpp/main.cpp
+	demo/undocumented/aliev-panfilov/cpp/main.cpp
+	demo/undocumented/functional/cpp/main.cpp
+	demo/undocumented/stokes-stabilized/cpp/main.cpp
+	demo/undocumented/stokes-taylor-hood/cpp/main.cpp
+	dolfin/mesh/BoundaryComputation.cpp
+	dolfin/mesh/BoundaryComputation.h
+	dolfin/mesh/BoundaryMesh.cpp
+	dolfin/mesh/BoundaryMesh.h
+	dolfin/mesh/IntervalCell.cpp
+	dolfin/mesh/IntervalCell.h
+	dolfin/mesh/MeshEntityIterator.h
+	dolfin/mesh/Point.cpp
+	dolfin/mesh/Point.h
+	dolfin/mesh/TetrahedronCell.cpp
+	dolfin/mesh/TetrahedronCell.h
+	dolfin/mesh/TopologyComputation.cpp
+	dolfin/mesh/TriangleCell.h
+Copyright: 2006-2008, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: bench/function/evaluation/cpp/P1.ufl
+	demo/pde/cahn-hilliard/python/demo.py
+	demo/undocumented/advection-diffusion/cpp/Velocity.ufl
+	demo/undocumented/dg-advection-diffusion/cpp/Velocity.ufl
+	demo/undocumented/lift-drag/cpp/Pressure.ufl
+	demo/undocumented/nonmatching-interpolation/cpp/P1.ufl
+	demo/undocumented/nonmatching-interpolation/cpp/P3.ufl
+	demo/undocumented/nonmatching-interpolation/cpp/main.cpp
+	demo/undocumented/nonmatching-interpolation/python/demo.py
+	demo/undocumented/nonmatching-projection/cpp/P1_projection.ufl
+	demo/undocumented/nonmatching-projection/cpp/P3.ufl
+	demo/undocumented/nonmatching-projection/cpp/main.cpp
+	demo/undocumented/nonmatching-projection/python/demo.py
+	dolfin/io/Encoder.h
+	test/unit/fem/cpp/test.cpp
+	test/unit/fem/python/test.py
+Copyright: 2009, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: cmake/scripts/generate-cmakefiles
+	demo/undocumented/elastodynamics/python/demo.py
+	demo/undocumented/stokes-iterative/python/demo.py
+	dolfin/graph/GraphBuilder.cpp
+	dolfin/graph/GraphBuilder.h
+	dolfin/graph/SCOTCH.cpp
+	dolfin/graph/SCOTCH.h
+	dolfin/io/VTKWriter.cpp
+	dolfin/io/VTKWriter.h
+	dolfin/la/GenericLUSolver.h
+	dolfin/la/PETScPreconditioner.cpp
+	dolfin/la/PETScPreconditioner.h
+	dolfin/la/TrilinosPreconditioner.cpp
+	dolfin/la/TrilinosPreconditioner.h
+	dolfin/mesh/refine.cpp
+	dolfin/mesh/refine.h
+Copyright: 2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: cmake/scripts/generate-form-files
 	demo/pde/poisson/cpp/Poisson.ufl
+	demo/undocumented/neumann-poisson/cpp/Poisson.ufl
+	demo/undocumented/reaction/cpp/main.cpp
 	dolfin/la/PETScLUSolver.cpp
 	dolfin/mesh/Box.h
 	dolfin/mesh/Rectangle.cpp
@@ -429,9 +353,60 @@
 	dolfin/ode/MultiAdaptiveNewtonSolver.cpp
 	dolfin/ode/TimeSlab.h
 	dolfin/ode/TimeSlabSolver.cpp
-	scripts/compileforms
-	dolfin/mesh/UnitSquare.cpp
 Copyright: 2005-2009, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/pde/poisson/python/demo.py
+	demo/undocumented/refinement/python/demo.py
+	demo/undocumented/tensor-weighted-poisson/python/generate_data.py
+	dolfin/fem/Assembler.cpp
+	dolfin/fem/Assembler.h
+	dolfin/fem/AssemblerTools.cpp
+	dolfin/fem/AssemblerTools.h
+	dolfin/fem/UFCCell.h
+	dolfin/fem/assemble.cpp
+	dolfin/fem/assemble.h
+	dolfin/mesh/MeshOrdering.cpp
+	dolfin/plot/plot.cpp
+	dolfin/plot/plot.h
+	dolfin/swig/function_pre.i
+	test/test.py
+Copyright: 2007-2009, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/block-matrix/cpp/main.cpp
+	demo/undocumented/block-matrix/python/demo.py
+	demo/undocumented/restriction/python/demo.py
+	demo/undocumented/sym-dirichlet-bc/python/demo.py
+	demo/undocumented/sym-dirichlet-bc/python/dg-demo.py
+	demo/undocumented/sym-dirichlet-bc/python/dg-speed-up-test.py
+	demo/undocumented/sym-dirichlet-bc/python/speed-up-test.py
+	dolfin/la/BlockMatrix.cpp
+	dolfin/la/BlockMatrix.h
+	dolfin/la/BlockVector.cpp
+	dolfin/la/BlockVector.h
+	dolfin/la/EpetraKrylovSolver.cpp
+	dolfin/la/EpetraKrylovSolver.h
+	site-packages/dolfin/mesh/boundarysubdomainfinder.py
+	test/unit/restriction/python/test.py
+Copyright: 2008, Kent-Andre Mardal <kent-and at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/la/uBLASDummyPreconditioner.cpp
+	dolfin/la/uBLASDummyPreconditioner.h
+	dolfin/la/uBLASKrylovMatrix.cpp
+	dolfin/la/uBLASKrylovMatrix.h
+	dolfin/mesh/Edge.cpp
+	dolfin/mesh/Face.cpp
+	dolfin/mesh/Facet.cpp
+	dolfin/mesh/MeshGeometry.cpp
+	dolfin/mesh/MeshGeometry.h
+	dolfin/mesh/TopologyComputation.h
+	site-packages/dolfin/mesh/meshconvert.py
+	test/unit/mesh/python/test.py
+	utils/convert/dolfin-convert
+	utils/xml/convertall
+Copyright: 2006, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
 Files: bench/fem/assembly/cpp/forms.h
@@ -451,176 +426,20 @@
 Copyright: 2008-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/ode/method-weights/cpp/main.cpp
-	demo/quadrature/cpp/main.cpp
-	dolfin/log/LogManager.cpp
-	dolfin/math/Lagrange.h
-	dolfin/math/basic.cpp
-	dolfin/math/basic.h
-	dolfin/ode/Method.cpp
-	dolfin/ode/Sample.cpp
-	dolfin/ode/Sample.h
-	dolfin/quadrature/GaussianQuadrature.h
-Copyright: 2003-2005, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/common/Variable.cpp
-	dolfin/common/Variable.h
-	dolfin/function/Function.cpp
-	dolfin/function/Function.h
-	dolfin/log/LogStream.h
-	dolfin/log/Logger.cpp
-	dolfin/log/Logger.h
-	dolfin/log/log.cpp
-	dolfin/math/Legendre.h
-	dolfin/quadrature/GaussQuadrature.h
-	dolfin/quadrature/LobattoQuadrature.h
-	dolfin/quadrature/RadauQuadrature.h
-Copyright: 2003-2009, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/pde/cahn-hilliard/cpp/CahnHilliard2D.ufl
-	demo/pde/cahn-hilliard/cpp/CahnHilliard3D.ufl
-	dolfin/la/GenericMatrix.h
-	dolfin/la/GenericVector.h
-	dolfin/la/UmfpackLUSolver.h
-	dolfin/la/uBLASILUPreconditioner.cpp
-	dolfin/la/uBLASILUPreconditioner.h
-	dolfin/la/uBLASKrylovSolver.cpp
-	dolfin/la/uBLASKrylovSolver.h
-	dolfin/la/uBLASMatrix.h
-	dolfin/la/uBLASPreconditioner.h
-Copyright: 2006-2009, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/pde/lift-drag/cpp/Drag.ufl
-	demo/pde/lift-drag/cpp/Lift.ufl
-	demo/pde/periodic/cpp/Poisson.ufl
-	dolfin/common/unittest.h
-	dolfin/fem/UFCMesh.h
-	dolfin/swig/generate.py
-	test/unit/function/cpp/test.cpp
-	test/unit/function/python/test.py
-	test/unit/io/python/test.py
-	test/unit/mesh/cpp/test.cpp
-Copyright: 2007, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/mesh/refinement/python/demo.py
-	demo/pde/poisson/python/demo.py
-	demo/pde/tensor-weighted-poisson/python/generate_data.py
-	dolfin/fem/Assembler.cpp
-	dolfin/fem/Assembler.h
-	dolfin/fem/AssemblerTools.cpp
-	dolfin/fem/AssemblerTools.h
-	dolfin/fem/UFCCell.h
-	dolfin/fem/assemble.cpp
-	dolfin/fem/assemble.h
-	dolfin/mesh/MeshOrdering.cpp
-	dolfin/plot/plot.cpp
-	dolfin/plot/plot.h
-	dolfin/swig/function_pre.i
-	test/test.py
-Copyright: 2007-2009, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/function/nonmatching-interpolation/cpp/P1.ufl
-	demo/function/nonmatching-interpolation/cpp/P3.ufl
-	demo/function/nonmatching-interpolation/cpp/main.cpp
-	demo/function/nonmatching-interpolation/python/demo.py
-	demo/function/nonmatching-projection/cpp/P1_projection.ufl
-	demo/function/nonmatching-projection/cpp/P3.ufl
-	demo/function/nonmatching-projection/cpp/main.cpp
-	demo/function/nonmatching-projection/python/demo.py
-	demo/pde/advection-diffusion/cpp/Velocity.ufl
-	demo/pde/cahn-hilliard/python/demo.py
-	demo/pde/dg/advection-diffusion/cpp/Velocity.ufl
-	demo/pde/lift-drag/cpp/Pressure.ufl
-	dolfin/io/Encoder.h
-	test/unit/fem/cpp/test.cpp
-	test/unit/fem/python/test.py
-	bench/function/evaluation/cpp/P1.ufl
-	demo/function/nonmatching-interpolation/cpp/P1.ufl
-Copyright: 2009, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: dolfin/common/Array.h
-Copyright: 2009-2010, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: dolfin/fem/GenericDofMap.h
-Copyright: 2010, Anders Logg <logg at simula.no>
-	   2010, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: dolfin/main/init.h
-	dolfin/ode/Adaptivity.h
-	dolfin/ode/Controller.cpp
-	dolfin/ode/Controller.h
-	dolfin/ode/MonoAdaptivity.h
-	dolfin/ode/TimeSlabSolver.h
-	misc/utils/matlab/meshindex.m
-	misc/utils/matlab/plotcontroller.m
-	misc/utils/system/monitor
-Copyright: 2005, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/la/GenericLinearSolver.h
-	site-packages/dolfin/common/time.py
-Copyright: 2008-2010, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/mesh/built-in/python/demo.py
-	demo/pde/mixed-poisson/cpp/P1Projection.ufl
-	dolfin/common/NoDeleter.h
-	dolfin/la/PETScObject.h
-	dolfin/main/SubSystemsManager.cpp
-	dolfin/main/SubSystemsManager.h
-Copyright: 2008, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/ode/stiff/cpp/TestProblem9.h
-	demo/ode/stiff/cpp/main.cpp
-	dolfin/io/XMLObject.h
-	dolfin/ode/dGqMethod.h
-	dolfin/quadrature/LobattoQuadrature.cpp
-	dolfin/quadrature/Quadrature.cpp
-	dolfin/quadrature/Quadrature.h
-	dolfin/quadrature/RadauQuadrature.cpp
-Copyright: 2003-2006, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/mesh/LocalMeshCoarsening.cpp
-	dolfin/mesh/LocalMeshCoarsening.h
-	dolfin/mesh/LocalMeshRefinement.cpp
-	dolfin/mesh/LocalMeshRefinement.h
-	dolfin/mesh/MeshHierarchy.cpp
-	dolfin/mesh/MeshHierarchy.h
-	dolfin/mesh/MeshHierarchyAlgorithms.cpp
-	dolfin/mesh/MeshHierarchyAlgorithms.h
-Copyright: 2006, Johan Hoffman <hoffman at csc.kth.se>
-License: LGPL-2.1
-
-Files: dolfin/la/MTL4Factory.cpp
-	dolfin/la/MTL4Factory.h
-	dolfin/la/MTL4Matrix.cpp
-	dolfin/la/MTL4Matrix.h
-	dolfin/la/MTL4Vector.cpp
-	dolfin/la/MTL4Vector.h
-Copyright: 2008, Dag Lindbo <dag at csc.kth.se>
-License: LGPL-2.1
-
-Files: dolfin/la/EpetraFactory.cpp
-	dolfin/la/EpetraFactory.h
-	dolfin/la/EpetraMatrix.cpp
-	dolfin/la/EpetraMatrix.h
-	dolfin/la/EpetraSparsityPattern.cpp
-	dolfin/la/EpetraSparsityPattern.h
-	dolfin/la/EpetraVector.cpp
-	dolfin/la/EpetraVector.h
-Copyright: 2008, Martin Sandve Alnæs <martinal at simula.no>
-	   2008, Kent-Andre Mardal <kent-and at simula.no>
-	   2008, Johannes Ring <johannr at simula.no>
+Files: demo/undocumented/lorenz/cpp/main.cpp
+	demo/undocumented/stiff/cpp/TestProblem3.h
+	demo/undocumented/stiff/cpp/TestProblem7.h
+	dolfin/math/Lagrange.cpp
+	dolfin/math/Legendre.cpp
+	dolfin/ode/Dependencies.cpp
+	dolfin/ode/Dependencies.h
+	dolfin/ode/Dual.cpp
+	dolfin/ode/Dual.h
+	dolfin/ode/cGqMethod.cpp
+	dolfin/ode/cGqMethod.h
+	dolfin/ode/dGqMethod.cpp
+	dolfin/quadrature/GaussQuadrature.cpp
+Copyright: 2003-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
 Files: bench/fem/speedup/cpp/submit-bench
@@ -639,11 +458,166 @@
 Copyright: 2009, Johan Hake <hake at simula.no>
 License: LGPL-2.1
 
-Files: bench/la/vector/assignment/cpp/main.cpp
-	dolfin/la/uBLASDenseMatrix.h
-	dolfin/la/uBLASSparseMatrix.h
-	dolfin/la/ublas.h
-Copyright: 2006, Garth N. Wells <gnw20 at cam.ac.uk>
+Files: dolfin/common/Variable.cpp
+	dolfin/common/Variable.h
+	dolfin/function/Function.cpp
+	dolfin/function/Function.h
+	dolfin/log/LogStream.h
+	dolfin/log/Logger.cpp
+	dolfin/log/Logger.h
+	dolfin/log/log.cpp
+	dolfin/math/Legendre.h
+	dolfin/quadrature/GaussQuadrature.h
+	dolfin/quadrature/LobattoQuadrature.h
+	dolfin/quadrature/RadauQuadrature.h
+Copyright: 2003-2009, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: bench/mesh/iteration/cpp/main.cpp
+	bench/mesh/refinement/cpp/main.cpp
+	bench/mesh/unitcube/cpp/main.cpp
+	demo/pde/mixed-poisson/cpp/MixedPoisson.ufl
+	dolfin/mesh/Cell.h
+	dolfin/mesh/Edge.h
+	dolfin/mesh/Face.h
+	dolfin/mesh/Facet.h
+	dolfin/mesh/TriangleCell.cpp
+	dolfin/mesh/UniformMeshRefinement.cpp
+	dolfin/mesh/UniformMeshRefinement.h
+	dolfin/mesh/Vertex.h
+Copyright: 2006-2010, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: bench/bench.py
+	bench/la/vector/access/cpp/main.cpp
+	demo/pde/navier-stokes/cpp/PressureUpdate.ufl
+	demo/pde/navier-stokes/cpp/TentativeVelocity.ufl
+	demo/pde/navier-stokes/cpp/VelocityUpdate.ufl
+	demo/pde/navier-stokes/cpp/main.cpp
+	demo/undocumented/extrapolation/cpp/main.cpp
+	dolfin/la/GenericMatrix.cpp
+	dolfin/mesh/FacetCell.cpp
+	dolfin/mesh/FacetCell.h
+	site-packages/dolfin/mesh/meshfunction.py
+Copyright: 2010, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/method-weights/cpp/main.cpp
+	demo/undocumented/quadrature/cpp/main.cpp
+	dolfin/log/LogManager.cpp
+	dolfin/math/Lagrange.h
+	dolfin/math/basic.cpp
+	dolfin/math/basic.h
+	dolfin/ode/Method.cpp
+	dolfin/ode/Sample.cpp
+	dolfin/ode/Sample.h
+	dolfin/quadrature/GaussianQuadrature.h
+Copyright: 2003-2005, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/lift-drag/cpp/Drag.ufl
+	demo/undocumented/lift-drag/cpp/Lift.ufl
+	demo/undocumented/periodic/cpp/Poisson.ufl
+	dolfin/common/unittest.h
+	dolfin/fem/UFCMesh.h
+	dolfin/swig/generate.py
+	test/unit/function/cpp/test.cpp
+	test/unit/function/python/test.py
+	test/unit/io/python/test.py
+	test/unit/mesh/cpp/test.cpp
+Copyright: 2007, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/main/init.h
+	dolfin/ode/Adaptivity.h
+	dolfin/ode/Controller.cpp
+	dolfin/ode/Controller.h
+	dolfin/ode/MonoAdaptivity.h
+	dolfin/ode/TimeSlabSolver.h
+	utils/matlab/meshindex.m
+	utils/matlab/plotcontroller.m
+	utils/system/monitor
+Copyright: 2005, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: site-packages/dolfin/adaptivity/dual.py
+	site-packages/dolfin/adaptivity/errorestimator.py
+	site-packages/dolfin/adaptivity/errorestimators.py
+	site-packages/dolfin/adaptivity/formmanipulation.py
+	site-packages/dolfin/adaptivity/marking.py
+	site-packages/dolfin/adaptivity/normestimators.py
+	site-packages/dolfin/adaptivity/residual.py
+	site-packages/dolfin/adaptivity/specialfunctions.py
+Copyright: 2009, Marie E. Rognes <meg at simula.no>
+License: GPL-3+
+
+Files: demo/undocumented/stiff/cpp/TestProblem9.h
+	demo/undocumented/stiff/cpp/main.cpp
+	dolfin/io/XMLObject.h
+	dolfin/ode/dGqMethod.h
+	dolfin/quadrature/LobattoQuadrature.cpp
+	dolfin/quadrature/Quadrature.cpp
+	dolfin/quadrature/Quadrature.h
+	dolfin/quadrature/RadauQuadrature.cpp
+Copyright: 2003-2006, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/mesh/LocalMeshCoarsening.cpp
+	dolfin/mesh/LocalMeshCoarsening.h
+	dolfin/mesh/LocalMeshRefinement.cpp
+	dolfin/mesh/LocalMeshRefinement.h
+	dolfin/mesh/MeshHierarchy.cpp
+	dolfin/mesh/MeshHierarchy.h
+	dolfin/mesh/MeshHierarchyAlgorithms.cpp
+	dolfin/mesh/MeshHierarchyAlgorithms.h
+Copyright: 2006, Johan Hoffman <hoffman at csc.kth.se>
+License: LGPL-2.1
+
+Files: dolfin/la/GenericMatrix.h
+	dolfin/la/GenericVector.h
+	dolfin/la/uBLASILUPreconditioner.cpp
+	dolfin/la/uBLASILUPreconditioner.h
+	dolfin/la/uBLASKrylovSolver.cpp
+	dolfin/la/uBLASKrylovSolver.h
+	dolfin/la/uBLASMatrix.h
+	dolfin/la/uBLASPreconditioner.h
+Copyright: 2006-2009, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: dolfin/la/EpetraFactory.cpp
+	dolfin/la/EpetraFactory.h
+	dolfin/la/EpetraMatrix.cpp
+	dolfin/la/EpetraMatrix.h
+	dolfin/la/EpetraSparsityPattern.cpp
+	dolfin/la/EpetraSparsityPattern.h
+	dolfin/la/EpetraVector.cpp
+	dolfin/la/EpetraVector.h
+Copyright: 2008, Martin Sandve Alnes <martinal at simula.no>
+	   2008, Kent-Andre Mardal <kent-and at simula.no>
+	   2008, Johannes Ring <johannr at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/advection-diffusion/cpp/AdvectionDiffusion.ufl
+	demo/undocumented/plot/cpp/main.cpp
+	demo/undocumented/sym-dirichlet-bc/cpp/main.cpp
+	dolfin/mesh/MeshConnectivity.cpp
+	dolfin/mesh/MeshConnectivity.h
+	dolfin/mesh/MeshEntityIterator.cpp
+	test/unit/test.py
+Copyright: 2006-2007, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: bench/fem/speedup/cpp/bench
+	demo/pde/navier-stokes/python/demo.py
+	demo/undocumented/extrapolation/python/demo.py
+	demo/undocumented/interpolation/python/demo.py
+	demo/undocumented/smoothing/python/demo.py
+	site-packages/dolfin/common/memory.py
+Copyright: 2010, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/extrapolation/python/demo2.py
+Copyright: 2010, Marie E. Rognes <meg at simula.no>
 License: LGPL-2.1
 
 Files: dolfin/ode/ODE.cpp
@@ -656,19 +630,19 @@
 	   2003-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: dolfin/fem/SparsityPatternBuilder.cpp
-	dolfin/la/KrylovSolver.cpp
-	dolfin/la/KrylovSolver.h
-	dolfin/la/LUSolver.h
-	dolfin/la/SparsityPattern.cpp
-	dolfin/la/SparsityPattern.h
-Copyright: 2007-2009, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/pde/curl-curl/cpp/CurrentDensity.ufl
-	demo/pde/curl-curl/cpp/EddyCurrents.ufl
-	demo/pde/curl-curl/cpp/main.cpp
-	demo/pde/curl-curl/python/demo.py
+Files: dolfin/la/MTL4Factory.cpp
+	dolfin/la/MTL4Factory.h
+	dolfin/la/MTL4Matrix.cpp
+	dolfin/la/MTL4Matrix.h
+	dolfin/la/MTL4Vector.cpp
+	dolfin/la/MTL4Vector.h
+Copyright: 2008, Dag Lindbo <dag at csc.kth.se>
+License: LGPL-2.1
+
+Files: demo/undocumented/curl-curl/cpp/CurrentDensity.ufl
+	demo/undocumented/curl-curl/cpp/EddyCurrents.ufl
+	demo/undocumented/curl-curl/cpp/main.cpp
+	demo/undocumented/curl-curl/python/demo.py
 	dolfin/fem/EqualityBC.cpp
 	dolfin/fem/EqualityBC.h
 Copyright: 2009, Bartosz Sawicki
@@ -690,15 +664,15 @@
 Copyright: 2008, Benjamin Kehlet <benjamik at student.matnat.uio.no>
 License: LGPL-2.1
 
-Files: demo/pde/dg/advection-diffusion/python/demo.py
-	demo/pde/hyperelasticity/python/demo.py
-	site-packages/dolfin/fem/form.py
-	site-packages/dolfin/function/functionspace.py
-	test/unit/la/python/test.py
-Copyright: 2008, Johan Hake <hake at simula.no>
-License: LGPL-2.1
-
-Files: demo/mesh/ale/cpp/main.cpp
+Files: demo/undocumented/built-in/python/demo.py
+	dolfin/common/NoDeleter.h
+	dolfin/la/PETScObject.h
+	dolfin/main/SubSystemsManager.cpp
+	dolfin/main/SubSystemsManager.h
+Copyright: 2008, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: demo/undocumented/ale/cpp/main.cpp
 	dolfin/ale/ALE.cpp
 	dolfin/ale/ALE.h
 	dolfin/ale/TransfiniteInterpolation.cpp
@@ -716,33 +690,46 @@
 	   2009, Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
 
-Files: dolfin/io/GenericFile.h
-	dolfin/io/MFile.cpp
-	dolfin/io/MFile.h
-	dolfin/io/MatlabFile.cpp
-Copyright: 2003-2008, Johan Hoffman <hoffman at csc.kth.se> 
-	   2003-2008, Anders Logg <logg at simula.no>
-License: LGPL-2.1
+Files: demo/undocumented/adaptive-pde/energy-norm-poisson.py
+	demo/undocumented/adaptive-pde/poisson.py
+	site-packages/dolfin/adaptivity/adaptivedata.py
+	site-packages/dolfin/adaptivity/updates.py
+Copyright: 2010, Marie E. Rognes <meg at simula.no>
+License: GPL-3+
 
 Files: dolfin/la/PETScKrylovSolver.h
-	misc/utils/octave/pdemesh.m
-	misc/utils/octave/pdeplot.m
-	misc/utils/octave/pdesurf.m
+	utils/octave/pdemesh.m
+	utils/octave/pdeplot.m
+	utils/octave/pdesurf.m
 Copyright: 2004-2005, Johan Jansson <johanjan at math.chalmers.se>
 License: LGPL-2.1
 
-Files: demo/ode/stiff/cpp/TestProblem1.h
-	demo/ode/stiff/cpp/TestProblem4.h
-	demo/ode/stiff/cpp/TestProblem5.h
-	demo/ode/stiff/cpp/TestProblem6.h
+Files: demo/undocumented/stiff/cpp/TestProblem1.h
+	demo/undocumented/stiff/cpp/TestProblem4.h
+	demo/undocumented/stiff/cpp/TestProblem5.h
+	demo/undocumented/stiff/cpp/TestProblem6.h
 Copyright: 2004-2006, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/elasticity/cpp/Elasticity.ufl
+Files: demo/undocumented/elasticity/cpp/Elasticity.ufl
 	dolfin/la/PETScKrylovSolver.cpp
 	dolfin/la/PETScUserPreconditioner.cpp
 	dolfin/la/PETScUserPreconditioner.h
 Copyright: 2005, Johan Jansson <johanjan at math.chalmers.se>
+License: LGPL-2.1
+
+Files: demo/undocumented/equality/cpp/Poisson.ufl
+	demo/undocumented/stokes-stabilized/cpp/Stokes.ufl
+	demo/undocumented/stokes-taylor-hood/cpp/Stokes.ufl
+	demo/undocumented/sym-dirichlet-bc/cpp/Poisson.ufl
+Copyright: 2005-2007, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: bench/la/vector/assignment/cpp/main.cpp
+	dolfin/la/uBLASDenseMatrix.h
+	dolfin/la/uBLASSparseMatrix.h
+	dolfin/la/ublas.h
+Copyright: 2006, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: dolfin/la/GenericSparsityPattern.h
@@ -750,6 +737,20 @@
 	dolfin/la/PETScFactory.h
 	dolfin/la/uBLASFactory.h
 Copyright: 2007, Ola Skavhaug <skavhaug at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/fem/SparsityPatternBuilder.cpp
+	dolfin/la/KrylovSolver.h
+	dolfin/la/SparsityPattern.cpp
+	dolfin/la/SparsityPattern.h
+Copyright: 2007-2009, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: demo/undocumented/dg-advection-diffusion/python/demo.py
+	site-packages/dolfin/fem/form.py
+	site-packages/dolfin/function/functionspace.py
+	test/unit/la/python/test.py
+Copyright: 2008, Johan Hake <hake at simula.no>
 License: LGPL-2.1
 
 Files: dolfin/graph/ParMETIS.cpp
@@ -761,34 +762,19 @@
 	   2008-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/elastodynamics/python/demo.py
-	dolfin/graph/GraphBuilder.cpp
-	dolfin/graph/GraphBuilder.h
-	dolfin/graph/SCOTCH.cpp
-	dolfin/graph/SCOTCH.h
-	dolfin/la/PETScPreconditioner.cpp
-	dolfin/la/PETScPreconditioner.h
-	dolfin/la/TrilinosPreconditioner.cpp
-	dolfin/la/TrilinosPreconditioner.h
-	dolfin/mesh/refine.cpp
-	dolfin/mesh/refine.h
-Copyright: 2010, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/fem/simple/cpp/main.cpp
+Files: demo/undocumented/conditional/cpp/Conditional.ufl
+	demo/undocumented/conditional/cpp/main.cpp
+	demo/undocumented/spatial-coordinates/cpp/SpatialCoordinates.ufl
+Copyright: 2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+License: GPL-3+
+
+Files: demo/undocumented/simple/cpp/main.cpp
 	dolfin/io/PythonFile.cpp
 	dolfin/io/PythonFile.h
 Copyright: 2003-2005, Johan Hoffman <hoffman at csc.kth.se>
 	   2003-2005, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: dolfin/io/MatlabFile.h
-	dolfin/io/OctaveFile.cpp
-	dolfin/io/OctaveFile.h
-Copyright: 2003-2006, Johan Hoffman <hoffman at csc.kth.se>
-	   2003-2006, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
 Files: dolfin/log/LogManager.h
 	dolfin/log/LogStream.cpp
 	dolfin/quadrature/GaussianQuadrature.cpp
@@ -807,33 +793,30 @@
 Copyright: 2005-2008, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: dolfin/io/VTKFile.cpp
-	dolfin/io/VTKFile.h
-Copyright: 2005-2009, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: dolfin/la/SLEPcEigenSolver.cpp
-	dolfin/la/SLEPcEigenSolver.h
-Copyright: 2005-2010, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
 Files: dolfin/la/UmfpackLUSolver.cpp
 	dolfin/la/uBLASVector.cpp
 	dolfin/la/uBLASVector.h
 Copyright: 2006-2008, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
+Files: dolfin/swig/parameter_post.i
+	dolfin/swig/parameter_pre.i
+	dolfin/swig/swig_version.i
+Copyright: 2006-2009, Johan Hake <hake at simula.no>
+License: LGPL-2.1
+
+Files: demo/pde/cahn-hilliard/cpp/CahnHilliard2D.ufl
+	demo/pde/cahn-hilliard/cpp/CahnHilliard3D.ufl
+	dolfin/la/UmfpackLUSolver.h
+Copyright: 2006-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
 Files: dolfin/main/MPI.cpp
 	dolfin/main/MPI.h
 	test/unit/io/cpp/test.cpp
 Copyright: 2007, Gustav Magnus Vikstrom <gustavv at ifi.uio.no>
 License: LGPL-2.1
 
-Files: dolfin/la/STLFactory.cpp
-	dolfin/la/STLFactory.h
-Copyright: 2007, Ilmar Wilbers <ilmarw at simula.no>
-License: LGPL-2.1
-
 Files: bench/fem/assembly/python/broken
 	test/memory/test.py
 	test/regression/test.py
@@ -846,22 +829,28 @@
 Copyright: 2008, Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
 
-Files: demo/adaptivity/adaptive-poisson/python/demo.py
-	demo/ode/lorenz/python/demo.py
-	demo/ode/lorenz/python/plot.py
+Files: demo/undocumented/adaptive-poisson/python/demo.py
+	demo/undocumented/lorenz/python/demo.py
+	demo/undocumented/lorenz/python/plot.py
 Copyright: 2008, Rolv Erlend Bredesen <rolv at simula.no>
 License: LGPL-2.1
 
 Files: dolfin/fem/FiniteElement.h
 	dolfin/fem/VariationalProblem.cpp
 	dolfin/fem/VariationalProblem.h
-Copyright: 2008-2009, Anders Logg <logg at simula.no> 
+Copyright: 2008-2009, Anders Logg <logg at simula.no>
 	   2008-2009, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/pde/elastodynamics/cpp/DG0_eps_xx.ufl
-	demo/pde/elastodynamics/cpp/ElastoDynamics.ufl
-	demo/pde/elastodynamics/cpp/main.cpp
+Files: demo/pde/biharmonic/cpp/main.cpp
+	demo/pde/biharmonic/python/demo.py
+	demo/undocumented/built-in/cpp/main.cpp
+Copyright: 2009, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+License: LGPL-2.1
+
+Files: demo/undocumented/elastodynamics/cpp/DG0_eps_xx.ufl
+	demo/undocumented/elastodynamics/cpp/ElastoDynamics.ufl
+	demo/undocumented/elastodynamics/cpp/main.cpp
 Copyright: 2009, Mirko Maraldi
 	   2009, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
@@ -873,47 +862,30 @@
 	   2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: bench/bench.py
-	bench/common/progress/cpp/main.cpp
-	bench/fem/speedup/cpp/bench
-	bench/la/vector/access/cpp/main.cpp
-	demo/adaptivity/extrapolation/cpp/main.cpp
-	demo/adaptivity/extrapolation/python/demo.py
-	demo/adaptivity/interpolation/python/demo.py
-	demo/mesh/smoothing/python/demo.py
-	dolfin/la/GenericMatrix.cpp
-	dolfin/mesh/FacetCell.cpp
-	dolfin/mesh/FacetCell.h
-	site-packages/dolfin/common/memory.py
-Copyright: 2010, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: bench/function/evaluation/cpp/main.cpp
-	demo/mesh/intersection/distancequeries/cpp/main.cpp
-	demo/mesh/intersection/entityintersection/cpp/main.cpp
-	dolfin/mesh/cgal_includes.h
-	dolfin/mesh/PrimitiveIntersector.cpp
-	dolfin/mesh/PrimitiveIntersector.h
-	dolfin/mesh/Triangle_3_Tetrahedron_3_do_intersect_SCK.cpp
-	dolfin/mesh/Triangle_3_Tetrahedron_3_do_intersect_SCK.h
-	dolfin/quadrature/BarycenterQuadrature.cpp
-	dolfin/quadrature/BarycenterQuadrature.h
-	test/unit/quadrature/cpp/test.cpp
-	test/unit/quadrature/python/test.py
-Copyright: 2010, André Massing <massing at simula.no>
-License: LGPL-2.1
-
-Files: debian/*
-Copyright: 2008-2010, Johannes Ring <johannr at simula.no>
-License: GPL-2+
-
-Files: debian/cdbs/1/class/scons-vars.mk
-	debian/cdbs/1/class/scons.mk
-Copyright: 2005, Matthew A. Nicholson <matt at matt-land.com>
-License: GPL-2+
-
-Files: demo/pde/dielectric/python/demo.py
-Copyright: 2008, Kristen Kaasbjerg <cosby at fys.ku.dk>
+Files: demo/undocumented/spatial-coordinates/cpp/main.cpp
+	demo/undocumented/spatial-coordinates/python/demo.py
+	dolfin/swig/documentation.py
+Copyright: 2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+License: LGPL-2.1
+
+Files: bench/function/extrapolation/python/bench
+	demo/undocumented/neumann-poisson/cpp/main.cpp
+	demo/undocumented/neumann-poisson/python/demo.py
+Copyright: 2010, Marie E. Rognes <meg at simula.no>
+License: LGPL-2.1
+
+Files: site-packages/dolfin/adaptivity/adaptive.py
+	site-packages/dolfin/adaptivity/utils.py
+Copyright: 2009-2010, Marie E. Rognes <meg at simula.no>
+License: GPL-3+
+
+Files: demo/undocumented/adaptive-pde/mixed-poisson.py
+	demo/undocumented/adaptive-pde/navier-stokes.py
+Copyright: 2010, Marie Rognes <meg at math.uio.no>
+License: GPL-3+
+
+Files: demo/undocumented/dielectric/python/demo.py
+Copyright: Kristen Kaasbjerg <cosby at fys.ku.dk>
 License: LGPL-2.1
 
 Files: dolfin/io/File.h
@@ -922,15 +894,20 @@
 	   2002-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: misc/utils/matlab/xmlmatrix.m
-	misc/utils/matlab/xmlvector.m
+Files: dolfin/common/timing.cpp
+	dolfin/log/Progress.cpp
+Copyright: 2003-2010, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: utils/matlab/xmlmatrix.m
+	utils/matlab/xmlvector.m
 Copyright: 2004, Georgios Foufas
 License: LGPL-2.1
 
 Files: dolfin/la/PETScMatrix.cpp
 	dolfin/la/PETScVector.h
-Copyright: 2004-2008, Johan Hoffman <hoffman at csc.kth.se> 
-	   2004-2008, Johan Jansson <johanjan at math.chalmers.se> 
+Copyright: 2004-2008, Johan Hoffman <hoffman at csc.kth.se>
+	   2004-2008, Johan Jansson <johanjan at math.chalmers.se>
 	   2004-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -939,7 +916,22 @@
 Copyright: 2005-2006, Johan Hake <hake at simula.no>
 License: LGPL-2.1
 
-Files: demo/mesh/meshfunction/cpp/main.cpp
+Files: dolfin/io/VTKFile.cpp
+	dolfin/io/VTKFile.h
+Copyright: 2005-2009, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: bench/fem/convergence/cpp/main.cpp
+	dolfin/common/timing.h
+Copyright: 2005-2010, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/la/SLEPcEigenSolver.cpp
+	dolfin/la/SLEPcEigenSolver.h
+Copyright: 2005-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: demo/undocumented/meshfunction/cpp/main.cpp
 	dolfin/io/XMLLocalMeshData.h
 Copyright: 2006, Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
@@ -949,24 +941,9 @@
 Copyright: 2007, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/pde/spatial-coordinates/cpp/main.cpp
-	demo/pde/spatial-coordinates/cpp/SpatialCoordinates.ufl
-	demo/pde/spatial-coordinates/python/demo.py
-Copyright: 2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
-License: LGPL-2.1
-
-Files: dolfin/la/UmfpackLUSolver.h
-Copyright: 2006-2010, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/pde/dg/advection-diffusion/cpp/AdvectionDiffusion.ufl
-Copyright: 2007, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl>
-	   2007, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/la/eigensolver/cpp/main.cpp
-Copyright: 2007-2010, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl>
-	   2007-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+Files: dolfin/la/STLFactory.cpp
+	dolfin/la/STLFactory.h
+Copyright: 2007, Ilmar Wilbers <ilmarw at simula.no>
 License: LGPL-2.1
 
 Files: dolfin/fem/DirichletBC.cpp
@@ -975,12 +952,6 @@
 	   2007-2008, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: dolfin/fem/DofMap.cpp
-	dolfin/fem/DofMap.h
-Copyright: 2007-2009, Anders Logg <logg at simula.no>
-	   2007-2009, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
 Files: dolfin/swig/exceptions.i
 	dolfin/swig/numpy_typemaps.i
 Copyright: 2007-2009, Ola Skavhaug <skavhaug at simula.no>
@@ -992,6 +963,11 @@
 	   2007-2010, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
+Files: dolfin/la/KrylovSolver.cpp
+	dolfin/la/LUSolver.h
+Copyright: 2007-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
 Files: dolfin/fem/DofMapBuilder.cpp
 	dolfin/fem/DofMapBuilder.h
 Copyright: 2008, Anders Logg <logg at simula.no>
@@ -1004,10 +980,8 @@
 	   2008, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/pde/waveguide/cpp/main.cpp
-	demo/pde/waveguide/python/demo.py
-	demo/pde/waveguide/cpp/Forms.py
-	demo/pde/waveguide/cpp/Forms.ufl
+Files: demo/undocumented/waveguide/cpp/main.cpp
+	demo/undocumented/waveguide/python/demo.py
 Copyright: 2008, Evan Lezar <elezar at sun.ac.za>
 License: LGPL-2.1
 
@@ -1016,41 +990,63 @@
 Copyright: 2008, Johan Jansson <johanjan at math.chalmers.se>
 License: LGPL-2.1
 
-Files: demo/pde/dg/advection-diffusion/cpp/Projection.ufl
+Files: demo/undocumented/dg-advection-diffusion/cpp/Projection.ufl
 	dolfin/mesh/UnitInterval.cpp
-Copyright: 2008, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl>
-License: LGPL-2.1
-
-Files: demo/mesh/intersection/meshintersection/2D/cpp/main.cpp
-	demo/mesh/intersection/meshintersection/2D/python/demo.py
+Copyright: 2008, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+License: LGPL-2.1
+
+Files: demo/undocumented/meshintersection/2D/cpp/main.cpp
+	demo/undocumented/meshintersection/2D/python/demo.py
 Copyright: 2008, Kristoffer Selim <selim at simula.no>
 License: LGPL-2.1
 
-Files: site-packages/dolfin/compilemodules/expressions.py
-	site-packages/dolfin/compilemodules/subdomains.py
-Copyright: 2008, Martin Sandve Alnes <martinal at simula.no>
-License: LGPL-2.1
-
-Files: demo/mesh/partitioning/cpp/main.cpp
-	demo/mesh/partitioning/python/demo.py
+Files: demo/undocumented/partitioning/cpp/main.cpp
+	demo/undocumented/partitioning/python/demo.py
 Copyright: 2008, Ola Skavhaug <skavhaug at simula.no>
 	   2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/mesh/ale/python/demo.py
+Files: demo/undocumented/ale/python/demo.py
 	dolfin/ale/ALEType.h
 Copyright: 2008, Solveig Bruvoll <solveio at ifi.uio.no>
 	   2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
+Files: site-packages/dolfin/compilemodules/expressions.py
+	site-packages/dolfin/compilemodules/subdomains.py
+Copyright: 2008-2008, Martin Sandve Alnes <martinal at simula.no>
+License: LGPL-2.1
+
 Files: dolfin/la/ITLKrylovSolver.cpp
 	dolfin/la/ITLKrylovSolver.h
 Copyright: 2008-2009, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
+Files: site-packages/dolfin/compilemodules/jit.py
+	site-packages/dolfin/function/expression.py
+Copyright: 2008-2009, Johan Hake <hake at simula.no>
+License: LGPL-2.1
+
 Files: dolfin/fem/SystemAssembler.cpp
 	dolfin/fem/SystemAssembler.h
 Copyright: 2008-2009, Kent-Andre Mardal <kent-and at simula.no>
+	   2008-2009, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: bench/fem/jit/python/bench
+	dolfin/mesh/MeshSmoothing.h
+Copyright: 2008-2010, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/la/GenericLinearSolver.h
+	site-packages/dolfin/common/time.py
+Copyright: 2008-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: dolfin/la/EpetraLUSolver.cpp
+	dolfin/la/EpetraLUSolver.h
+Copyright: 2008-2010, Kent-Andre Mardal <kent-and at simula.no>
+	   2008-2010, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: dolfin/ode/StabilityAnalysis.cpp
@@ -1058,41 +1054,34 @@
 Copyright: 2009, Benjamin Kehlet <benjamik at student.matnat.uio.no>
 License: LGPL-2.1
 
-Files: demo/parameters/cpp/main.cpp
-	demo/parameters/python/demo.py
-Copyright: 2009, Johan Hake <hake at simula.no>
-	   2009, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/mesh/built-in/cpp/main.cpp
-	demo/pde/dg/biharmonic/cpp/main.cpp
-	demo/pde/dg/biharmonic/python/demo.py
-Copyright: 2009, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl>
-License: LGPL-2.1
-
-Files: demo/ode/courtemanche/cpp/main.cpp
-Copyright: 2006-2008, Glenn Terje Lines <glennli at simula.no>
-	   2006-2008, Ola Skavhaug <skavhaug at simula.no>
-	   2006-2008, Simula Research Laboratory
-License: LGPL-2.1
-
-Files: scons/simula-scons/*
-Copyright: 2007-2008, Ã
smund Ødegård <aasmund at simula.no> 
-	   2007-2008, Simula Research Laboratory
-License: MIT
-
-Files: scons/simula-scons/simula_scons/ExtendedEnvironment.py
-Copyright: 2006, Richard Levitte <richard at levitte.org>
-License: BSD-C2
-
-Files: scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/hypre/hypre-configure
-Copyright: 2006, The Regents of the University of California
-	   2003, Free Software Foundation, Inc
-License: LGPL-2.1
-
-Files: scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/hypre/hypre-struct_overlap_innerprod.c
-Copyright: 2006, The Regents of the University of California
-License: LGPL-2.1
+Files: demo/undocumented/parameters/cpp/main.cpp
+	demo/undocumented/parameters/python/demo.py
+Copyright: 2009, Johan Hake <hake at simula.no> and Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/mesh/PrimitiveIntersector.cpp
+	dolfin/mesh/PrimitiveIntersector.h
+Copyright: 2010, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/entityintersection/cpp/main.cpp
+	dolfin/mesh/Triangle_3_Tetrahedron_3_do_intersect_SCK.cpp
+Copyright: 2010, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/waveguide/cpp/Forms.py
+	demo/undocumented/waveguide/cpp/Forms.ufl
+Copyright: 2008, Evan Lezar <elezar at sun.ac.za>
+License: LGPL-2.1
+
+Files: demo/undocumented/trilinos/python/demo.py
+	demo/undocumented/trilinos/python/demo2.py
+Copyright: 2008, Kent-Andre Mardal <kent-and at simula.no>
+License: LGPL-2.1
+
+Files: debian/*
+Copyright: 2008-2010, Johannes Ring <johannr at simula.no>
+License: GPL-2+
 
 Files: debian/cdbs/1/rules/copyright-check.mk
 Copyright: 2005-2008, Jonas Smedegaard <dr at jones.dk>
@@ -1106,29 +1095,25 @@
 Copyright: 2007-2008, Adam D. Barratt
 License: GPL-2+
 
-Files: site-packages/dolfin_utils/wrappers/coefficient.py
-Copyright: 2008, Anders Logg <logg at simula.no>
+Files: site-packages/dolfin_utils/wrappers/functionspace.py
+Copyright: 2008, Martin Sandve Alnes <martinal at simula.no>
 License: GPL-3+
 
-Files: site-packages/dolfin_utils/wrappers/functionspace.py
-Copyright: 2008, Martin Sandve Alnæs <martinal at simula.no>
-License: GPL-3+
-
 Files: site-packages/dolfin_utils/wrappers/form.py
-Copyright: 2008-2009, Martin Sandve Alnæs <martinal at simula.no>
+Copyright: 2008-2009, Martin Sandve Alnes <martinal at simula.no>
 	   2008-2009, Anders Logg <logg at simula.no>
 License: GPL-3+
 
 Files: site-packages/dolfin_utils/wrappers/wrappers.py
-Copyright: 2008-2009, Martin Sandve Alnæs <martinal at simula.no>
+Copyright: 2008-2009, Martin Sandve Alnes <martinal at simula.no>
 License: GPL-3+
 
-Files: demo/pde/simple/cpp/ReactionDiffusion.ufl
+Files: demo/undocumented/reaction-diffusion/cpp/ReactionDiffusion.ufl
 Copyright: 2009, Anders Logg <logg at simula.no>
 License: GPL-3+
 
-Files: site-packages/dolfin_utils/wrappers/coefficient_set.py
-Copyright: 2009, Martin Sandve Alnæs <martinal at simula.no>
+Files: demo/undocumented/conditional/python/demo.py
+Copyright: 2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
 License: GPL-3+
 
 Files: doc/manual/algorithm.sty
@@ -1139,14 +1124,16 @@
 Copyright: 2003-2006, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: misc/utils/xml/inp2xml
-Copyright: 2002, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: misc/utils/matlab/writegid.m
-Copyright: 2001-2002, Rasmus Hemph
-	   2001-2002, Alexandra Krusper
-	   2001-2002, Walter Villanueva
+Files: dolfin/fem/Form.h
+Copyright: 2007-2009, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/tensor-weighted-poisson/python/demo.py
+Copyright: 2009, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/la/LUSolver.cpp
+Copyright: 20010 Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: dolfin/io/XMLVector.cpp
@@ -1158,21 +1145,21 @@
 Copyright: 2002-2006, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/ode/harmonic/cpp/main.cpp
+Files: demo/undocumented/harmonic/cpp/main.cpp
 Copyright: 2002-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
 Files: dolfin/io/File.cpp
-Copyright: 2002-2009, Johan Hoffman <hoffman at csc.kth.se> 
+Copyright: 2002-2009, Johan Hoffman <hoffman at csc.kth.se>
 	   2002-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: misc/utils/matlab/plotslab.m
+Files: utils/matlab/plotslab.m
 Copyright: 2003, Johan Hoffman <hoffman at csc.kth.se>
 	   2003-2005, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/ode/stiff/cpp/TestProblem8.h
+Files: demo/undocumented/stiff/cpp/TestProblem8.h
 Copyright: 2003-2005, Johan Jansson <johanjan at math.chalmers.se>
 License: LGPL-2.1
 
@@ -1186,17 +1173,18 @@
 	   2003-2008, Jim Tilander <jt at dd.chalmers.se>
 License: LGPL-2.1
 
+Files: dolfin/io/GenericFile.h
+Copyright: 2003-2008, Johan Hoffman <hoffman at csc.kth.se>
+	   2003-2008, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
 Files: dolfin/log/log.h
 Copyright: 2003-2009, Anders Logg <logg at simula.no>
 	   2003-2009, Jim Tilander <jt at dd.chalmers.se>
 License: LGPL-2.1
 
-Files: misc/utils/matlab/xmlmesh.m
+Files: utils/matlab/xmlmesh.m
 Copyright: 2004, Erik Svensson <eriksv at math.chalmers.se>
-License: LGPL-2.1
-
-Files: misc/utils/gid/dolfin.bas
-Copyright: 2004, Harald Svensson <harald.s at home.se>
 License: LGPL-2.1
 
 Files: doc/manual/chapters/contributing-dolfin.tex
@@ -1205,7 +1193,7 @@
 License: LGPL-2.1
 
 Files: dolfin/ode/Partition.h
-Copyright: 2004-2005, Johan Jansson <johanjan at math.chalmers.se> 
+Copyright: 2004-2005, Johan Jansson <johanjan at math.chalmers.se>
 	   2004-2005, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -1219,7 +1207,7 @@
 	   2004-2007, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/ode/stiff/cpp/TestProblem2.h
+Files: demo/undocumented/stiff/cpp/TestProblem2.h
 Copyright: 2004-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -1234,7 +1222,7 @@
 License: LGPL-2.1
 
 Files: dolfin/la/PETScMatrix.h
-Copyright: 2004-2009, Johan Hoffman <hoffman at csc.kth.se>, 
+Copyright: 2004-2009, Johan Hoffman <hoffman at csc.kth.se>
 	   2004-2009, Johan Jansson <johanjan at math.chalmers.se>
 	   2004-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
@@ -1244,12 +1232,13 @@
 	   2004-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/nonlinear-poisson/cpp/NonlinearPoisson.ufl
+Files: demo/undocumented/nonlinear-poisson/cpp/NonlinearPoisson.ufl
 Copyright: 2005, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: dolfin/la/SLEPcEigenSolver.h
-Copyright: 2005-2006, Garth N. Wells <gnw20 at cam.ac.uk>
+Files: dolfin/la/PETScKrylovMatrix.cpp
+Copyright: 2005-2006, Anders Logg <logg at simula.no>
+	   2005-2006, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: dolfin/swig/dolfin.i
@@ -1260,46 +1249,17 @@
 Copyright: 2005-2006, Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/mixed-poisson/cpp/MixedPoisson.ufl
-Copyright: 2006-2007, Anders Logg <logg at simula.no>
-	   2006-2007, Marie Rognes <meg at simula.no>
-License: LGPL-2.1
-
-Files: site-packages/dolfin/adaptivity/dual.py
-	site-packages/dolfin/adaptivity/errorestimator.py
-	site-packages/dolfin/adaptivity/errorestimators.py
-	site-packages/dolfin/adaptivity/formmanipulation.py
-	site-packages/dolfin/adaptivity/marking.py
-	site-packages/dolfin/adaptivity/normestimators.py
-	site-packages/dolfin/adaptivity/residual.py
-	site-packages/dolfin/adaptivity/specialfunctions.py
-Copyright: 2009, Marie Rognes <meg at simula.no>
-License: GPL-3+
-
-Files: site-packages/dolfin/adaptivity/adaptive.py
-	site-packages/dolfin/adaptivity/utils.py
-Copyright: 2009-2010, Marie Rognes <meg at simula.no>
-License: GPL-3+
-
-Files: bench/function/extrapolation/python/bench
-	demo/adaptivity/extrapolation/python/demo2.py
-	demo/adaptivity/pde/energy-norm-poisson.py
-	demo/adaptivity/pde/mixed-poisson.py
-	demo/adaptivity/pde/navier-stokes.py
-	demo/adaptivity/pde/poisson.py
-	demo/pde/neumann-poisson/cpp/main.cpp
-	demo/pde/neumann-poisson/python/demo.py
-	site-packages/dolfin/adaptivity/adaptivedata.py
-	site-packages/dolfin/adaptivity/updates.py
-Copyright: 2010, Marie Rognes <meg at simula.no>
-License: GPL-3+
-
-Files: demo/pde/nonlinear-poisson/cpp/main.cpp
+Files: dolfin/la/PETScKrylovMatrix.h
+Copyright: 2005-2010, Anders Logg <logg at simula.no>
+	   2005-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: demo/undocumented/nonlinear-poisson/cpp/main.cpp
 Copyright: 2006-2007, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/pde/dg/poisson/cpp/Poisson.ufl
-Copyright: 2006-2007, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl> 
+Files: demo/undocumented/dg-poisson/cpp/Poisson.ufl
+Copyright: 2006-2007, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
 	   2006-2007, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -1308,74 +1268,74 @@
 	   2006-2008, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/pde/dg/poisson/cpp/main.cpp
+Files: demo/undocumented/dg-poisson/cpp/main.cpp
 Copyright: 2006-2008, Anders Logg <logg at simula.no>
-	   2006-2008, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl>
-License: LGPL-2.1
-
-Files: demo/pde/elasticity/cpp/main.cpp
+	   2006-2008, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+License: LGPL-2.1
+
+Files: demo/undocumented/elasticity/cpp/main.cpp
 Copyright: 2006-2009, Johan Jansson <johanjan at math.chalmers.se>
 	   2006-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/mixed-poisson/cpp/main.cpp
-Copyright: 2007, Anders Logg <logg at simula.no>
-	   2007, Marie Rognes <meg at simula.no>
-License: LGPL-2.1
-
 Files: test/unit/la/cpp/test.cpp
 Copyright: 2007, Johan Hake <hake at simula.no>
 License: LGPL-2.1
 
-Files: site-packages/dolfin/compilemodules/jit.py
-	site-packages/dolfin/function/expression.py
-Copyright: 2008-2009, Johan Hake <hake at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/swig/parameter_post.i
-	dolfin/swig/parameter_pre.i
-	dolfin/swig/swig_version.i
-Copyright: 2006-2009, Johan Hake <hake at simula.no>
+Files: demo/undocumented/dg-advection-diffusion/cpp/AdvectionDiffusion.ufl
+Copyright: 2007, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+	   2007, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: dolfin/mesh/PointCell.h
-Copyright: 2007, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl>
+Copyright: 2007-2007, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
 License: LGPL-2.1
 
 Files: dolfin/fem/Form.cpp
 Copyright: 2007-2008, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/pde/dg/advection-diffusion/cpp/main.cpp
-Copyright: 2007-2008, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl>
-	   2007-2008, Anders Logg <logg at simula.no> 
+Files: demo/undocumented/dg-advection-diffusion/cpp/main.cpp
+Copyright: 2007-2008, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+	   2007-2008, Anders Logg <logg at simula.no>
 	   2007-2008, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: dolfin/mesh/PointCell.cpp
-Copyright: 2007-2008, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl>
+Copyright: 2007-2008, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
 License: LGPL-2.1
 
 Files: dolfin/swig/typemaps.i
-Copyright: 2007-2009, Anders logg
-License: LGPL-2.1
-
-Files: bench/fem/jit/python/bench
-	dolfin/mesh/MeshSmoothing.h
-Copyright: 2008-2010, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/fem/assembly/cpp/main.cpp
+Copyright: 2007-2009, Anders logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/pde/mixed-poisson/cpp/main.cpp
+Copyright: 2007-2010, Anders Logg <logg at simula.no>
+	   2007-2010, Marie Rognes <meg at math.uio.no>
+License: LGPL-2.1
+
+Files: demo/la/eigenvalue/cpp/main.cpp
+Copyright: 2007-2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+	   2007-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: demo/undocumented/assembly/cpp/main.cpp
 Copyright: 2008, Anders Logg <logg at simula.no>
 	   2008, Gustav Magnus Vikstrom <gustavv at ifi.uio.no>
 License: LGPL-2.1
 
-Files: site-packages/dolfin/plot.py
+Files: site-packages/dolfin/common/plot.py
 Copyright: 2008, Joachim B. Haga <jobh at broadpark.no>
 License: LGPL-2.1
 
 Files: dolfin/mesh/UnitSphere.h
 Copyright: 2008, Nuno David Lopes <ndl at ptmat.fc.ul.pt>
+License: LGPL-2.1
+
+Files: dolfin/main/mpiutils.h
+Copyright: 2008-2009, Niclas Jansson <njansson at kth.se>
+	   2008-2009, Anders Logg <logg at simula.no>
+	   2008-2009, Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
 
 Files: bench/fem/assembly/cpp/main.cpp
@@ -1384,39 +1344,37 @@
 	   2008-2010, Ilmar Wilbers <ilmarw at simula.no>
 License: LGPL-2.1
 
-Files: dolfin/main/mpiutils.h
-Copyright: 2008-2009, Niclas Jansson <njansson at kth.se>
-	   2008-2009, Anders Logg <logg at simula.no> 
-	   2008-2009, Ola Skavhaug <skavhaug at simula.no>
+Files: demo/pde/hyperelasticity/python/demo.py
+Copyright: 2008-2010, Johan Hake <hake at simula.no>
+	   2008-2010, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: site-packages/dolfin/common/donothing.py
 Copyright: 2009, Hans Petter Langtangen <hpl at simula.no>
 License: LGPL-2.1
 
+Files: dolfin/common/Set.h
+Copyright: 2009, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: demo/pde/hyperelasticity/cpp/main.cpp
+Copyright: 2009, Harish Narayanyan <harish at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/swig/la_pre.i
+Copyright: 2009, Johan Jansson <johanjan at math.chalmers.se>
+License: LGPL-2.1
+
 Files: test/unit/meshconvert/cpp/test.cpp
 Copyright: 2009, Johannes Ring <johannr at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/dg/biharmonic/cpp/Biharmonic.ufl
-Copyright: 2009, Kristian B. Ølgaard <k.b.oelgaard at tudelft.nl>
+Files: demo/pde/biharmonic/cpp/Biharmonic.ufl
+Copyright: 2009, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
 	   2009, Garth N. Wells <gnw20 at cam.ac.uk>
 	   2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: dolfin/mesh/MeshFunction.cpp
-Copyright: 2009, Ola Skavhaug <skavhaug at simula.no>
-License: LGPL-2.1
-
-Files: demo/pde/hyperelasticity/cpp/HyperElasticity.ufl
-	demo/pde/hyperelasticity/cpp/main.cpp
-Copyright: 2009, Harish Narayanan <harish at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/swig/la_pre.i
-Copyright: 2009, Johan Jansson <johanjan at math.chalmers.se>
-License: LGPL-2.1
-
 Files: dolfin/fem/ufcexp.h
 Copyright: 2009, Shawn W. Walker <walker at courant.nyu.edu>
 License: LGPL-2.1
@@ -1425,17 +1383,77 @@
 Copyright: 2009-2010, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
+Files: dolfin/common/Array.h
+Copyright: 2009-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: demo/pde/hyperelasticity/cpp/HyperElasticity.ufl
+Copyright: 2009-2010, Harish Narayanan <harish at simula.no>
+	   2009-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: dolfin/fem/GenericDofMap.h
+Copyright: 2010, Anders Logg <logg at simula.no>
+	   2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: test/unit/quadrature/python/test.py
+Copyright: 2010, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
+Files: bench/plot.py
+Copyright: 2010, Johannes Ring <johannr at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/quadrature/BarycenterQuadrature.cpp
+Copyright: 2010, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/quadrature/BarycenterQuadrature.h
+Copyright: 2010, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
+Files: bench/function/evaluation/cpp/main.cpp
+Copyright: 2010, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
+Files: bench/common/progress/cpp/main.cpp
+Copyright: 22010 Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/courtemanche/cpp/main.cpp
+Copyright: 2006-2009, Glenn Terje Lines <glennli at simula.no>
+	   2006-2009, Ola Skavhaug <skavhaug at simula.no>
+	   2006-2009, Simula Research Laboratory
+License: LGPL-2.1
+
+Files: dolfin/mesh/cgal_includes.h
+Copyright: 2010, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
+Files: dolfin/mesh/Triangle_3_Tetrahedron_3_do_intersect_SCK.h
+Copyright: 2010, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/distancequeries/cpp/main.cpp
+Copyright: 2010, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
+Files: test/unit/quadrature/cpp/test.cpp
+Copyright: 2010, Andre Massing <massing at simula.no>
+License: LGPL-2.1
+
 Files: site-packages/dolfin_utils/pjobs/pjobs.py
-Copyright: 2009, Martin Sandve Alnæs <martinal at simula.no>
+Copyright: 2009, Martin Sandve Alnes <martinal at simula.no>
 License: LGPL-3
+
+Files: cmake/modules/FindGMP.cmake
+Copyright: 2006, Laurent Montel, <montel at kde.org>
+License: BSD
 
 Files: dolfin/io/base64.cpp
 Copyright: 2004-2008, René Nyffenegger <rene.nyffenegger at adp-gmbh.ch>
 License: PD
-
-Files: bench/plot.py
-Copyright: 2010, Johannes Ring <johannr at simula.no>
-License: LGPL-2.1
 
 License: GPL-2
  On Debian systems, the complete text of the GNU General Public License
@@ -1463,48 +1481,3 @@
  On Debian systems, the complete text of the GNU Lesser General Public
  License (LGPL) version 3 can be found at
  "/usr/share/common-licenses/LGPL-3".
-
-License: MIT 
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
- NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
- LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
- OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
- WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-License: BSD-C2
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-   1. Redistributions of source code must retain the above copyright
-      notice, this list of conditions and the following disclaimer.
-   2. Redistributions in binary form must reproduce the above
-      copyright notice, this list of conditions and the following
-      disclaimer in the documentation and/or other materials provided
-      with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY THE FREEBSD PROJECT ``AS IS'' AND ANY
- EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
- PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE FREEBSD PROJECT OR
- CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
- EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
- PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
- LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
- NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
- SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-

Modified: packages/fenics/dolfin/trunk/debian/copyright_hints
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/copyright_hints?rev=36889&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/copyright_hints (original)
+++ packages/fenics/dolfin/trunk/debian/copyright_hints Mon Sep 13 09:57:55 2010
@@ -2,14 +2,13 @@
 Upstream-Name: Untrusted draft - double-check copyrights yourself!
 
 Files: AUTHORS
+	CMakeLists.txt
 	ChangeLog
-	INSTALL
-	SConstruct
 	TODO
+	bench/CMakeLists.txt
 	bench/README
-	bench/SConscript
-	bench/common/progress/cpp/SConstruct
-	bench/fem/assembly/cpp/SConstruct
+	bench/common/progress/cpp/CMakeLists.txt
+	bench/fem/assembly/cpp/CMakeLists.txt
 	bench/fem/assembly/cpp/forms/Elasticity3D.ufl
 	bench/fem/assembly/cpp/forms/NSEMomentum3D.ufl
 	bench/fem/assembly/cpp/forms/Poisson2DP1.ufl
@@ -17,20 +16,40 @@
 	bench/fem/assembly/cpp/forms/Poisson2DP3.ufl
 	bench/fem/assembly/cpp/forms/StabStokes2D.ufl
 	bench/fem/assembly/cpp/forms/THStokes2D.ufl
+	bench/fem/convergence/cpp/CMakeLists.txt
 	bench/fem/convergence/cpp/README
-	bench/fem/convergence/cpp/SConstruct
+	bench/fem/speedup/cpp/CMakeLists.txt
 	bench/fem/speedup/cpp/README
-	bench/fem/speedup/cpp/SConstruct
 	bench/fem/speedup/cpp/clean.sh
-	bench/function/evaluation/cpp/SConstruct
-	bench/la/vector/access/cpp/SConstruct
-	bench/la/vector/assignment/cpp/SConstruct
+	bench/function/evaluation/cpp/CMakeLists.txt
+	bench/la/vector/access/cpp/CMakeLists.txt
+	bench/la/vector/assignment/cpp/CMakeLists.txt
 	bench/logs/bench.log
 	bench/logs/milestones.log
-	bench/mesh/iteration/cpp/SConstruct
-	bench/mesh/refinement/cpp/SConstruct
-	bench/mesh/unitcube/cpp/SConstruct
-	data/SConscript
+	bench/mesh/iteration/cpp/CMakeLists.txt
+	bench/mesh/refinement/cpp/CMakeLists.txt
+	bench/mesh/unitcube/cpp/CMakeLists.txt
+	cmake.local
+	cmake/modules/FindAMD.cmake
+	cmake/modules/FindArmadillo.cmake
+	cmake/modules/FindBLAS.cmake
+	cmake/modules/FindCGAL.cmake
+	cmake/modules/FindCHOLMOD.cmake
+	cmake/modules/FindCppUnit.cmake
+	cmake/modules/FindLAPACK.cmake
+	cmake/modules/FindMTL4.cmake
+	cmake/modules/FindNumPy.cmake
+	cmake/modules/FindPETSc.cmake
+	cmake/modules/FindParMETIS.cmake
+	cmake/modules/FindScotchPT.cmake
+	cmake/modules/FindTrilinos.cmake
+	cmake/modules/FindUFC.cmake
+	cmake/modules/FindUMFPACK.cmake
+	cmake/post-install/CMakeLists.txt
+	cmake/templates/cmake_uninstall.cmake.in
+	cmake/templates/dolfin-config.cmake.in
+	cmake/templates/dolfin.conf.in
+	cmake/templates/dolfin.pc.in
 	data/graphs/directed_graph.xml
 	data/graphs/undirected_graph.xml
 	data/meshes/README
@@ -38,6 +57,7 @@
 	data/meshes/dolfin-inside-1.xml.gz
 	data/meshes/dolfin-inside-2.xml.gz
 	data/meshes/gear.xml.gz
+	data/meshes/lshape.xml.gz
 	data/meshes/meshbc.xml.gz
 	data/meshes/rotator.xml.gz
 	data/meshes/slit.xml.gz
@@ -59,125 +79,145 @@
 	debian/control
 	debian/dolfin-bin.install
 	debian/dolfin-doc.doc-base
+	debian/dolfin-doc.install
 	debian/libdolfin0-dev.install
 	debian/libdolfin0.install
+	debian/patches/cmake_find_petsc_slepc.patch
+	debian/patches/cmake_find_trilinos.patch
+	debian/patches/install.patch
+	debian/patches/series
 	debian/python-dolfin.install
 	debian/rules
 	debian/source/format
 	debian/watch
-	demo/SConscript
-	demo/adaptivity/adaptive-poisson/cpp/README
-	demo/adaptivity/extrapolation/cpp/P1.ufl
-	demo/adaptivity/extrapolation/cpp/P2.ufl
-	demo/adaptivity/extrapolation/cpp/SConstruct
-	demo/adaptivity/interpolation/cpp/README
-	demo/adaptivity/time-series/cpp/SConstruct
-	demo/fem/assembly/cpp/SConstruct
-	demo/fem/assembly/python/README
-	demo/fem/simple/cpp/SConstruct
-	demo/fem/simple/tetrahedron.xml.gz
-	demo/function/eval/cpp/SConstruct
-	demo/function/nonmatching-interpolation/cpp/SConstruct
-	demo/function/nonmatching-projection/cpp/SConstruct
-	demo/function/projection-interpolation/cpp/README
-	demo/function/restriction/cpp/README
-	demo/la/block-matrix/cpp/SConstruct
-	demo/la/eigensolver/cpp/SConstruct
-	demo/mesh/ale/cpp/SConstruct
-	demo/mesh/built-in/cpp/SConstruct
-	demo/mesh/intersection/distancequeries/cpp/SConstruct
-	demo/mesh/intersection/distancequeries/python/README
-	demo/mesh/intersection/entityintersection/cpp/SConstruct
-	demo/mesh/intersection/meshintersection/2D/cpp/SConstruct
-	demo/mesh/intersection/meshintersection/3D/cpp/README
-	demo/mesh/meshfunction/cpp/SConstruct
-	demo/mesh/meshfunction/cpp/plot.py
-	demo/mesh/meshfunction/mesh2D.xml.gz
-	demo/mesh/meshfunction/meshfunction.xml
-	demo/mesh/partitioning/cpp/SConstruct
-	demo/mesh/partitioning/cpp/plotpartitions
-	demo/mesh/partitioning/cpp/unitsquare.xml.gz
-	demo/mesh/partitioning/python/unitsquare.xml.gz
-	demo/mesh/refinement/cpp/SConstruct
-	demo/mesh/smoothing/cpp/README
-	demo/mesh/subdomains/cpp/SConstruct
-	demo/mesh/submesh/cpp/SConstruct
-	demo/ode/aliev-panfilov/cpp/SConstruct
-	demo/ode/aliev-panfilov/cpp/plot.py
-	demo/ode/collection/cpp/SConstruct
-	demo/ode/collection/cpp/plot.py
-	demo/ode/complex/cpp/SConstruct
-	demo/ode/complex/cpp/plot.py
-	demo/ode/courtemanche/cpp/SConstruct
-	demo/ode/courtemanche/cpp/plot.py
-	demo/ode/harmonic/cpp/SConstruct
-	demo/ode/harmonic/cpp/plot.py
-	demo/ode/harmonic/cpp/plot_dual.py
-	demo/ode/lorenz/cpp/SConstruct
-	demo/ode/lorenz/cpp/plot.py
-	demo/ode/lorenz/cpp/stabilityfactors.py
-	demo/ode/method-weights/cpp/SConstruct
-	demo/ode/reaction/cpp/SConstruct
-	demo/ode/reaction/cpp/plot.py
-	demo/ode/stiff/cpp/SConstruct
-	demo/ode/stiff/cpp/plot.py
-	demo/ode/stiff/cpp/run-tests.sh
-	demo/parameters/cpp/SConstruct
-	demo/parameters/cpp/parameters.xml
-	demo/parameters/python/parameters.xml
-	demo/pde/advection-diffusion/cpp/SConstruct
-	demo/pde/advection-diffusion/subdomains.xml.gz
-	demo/pde/advection-diffusion/velocity.xml.gz
-	demo/pde/bcs/cpp/SConstruct
-	demo/pde/cahn-hilliard/cpp/SConstruct
-	demo/pde/cahn-hilliard/python/README
-	demo/pde/curl-curl/cpp/SConstruct
-	demo/pde/dg/advection-diffusion/cpp/SConstruct
-	demo/pde/dg/advection-diffusion/mesh.xml.gz
-	demo/pde/dg/advection-diffusion/python/functions2D.h
-	demo/pde/dg/biharmonic/cpp/SConstruct
-	demo/pde/dg/poisson/cpp/SConstruct
-	demo/pde/dg/poisson/cpp/plot.py
-	demo/pde/dielectric/cpp/README
-	demo/pde/elasticity/cpp/SConstruct
-	demo/pde/elasticity/cpp/plot.py
-	demo/pde/elastodynamics/cpp/SConstruct
-	demo/pde/equality/cpp/SConstruct
-	demo/pde/equality/python/README
-	demo/pde/functional/cpp/SConstruct
-	demo/pde/hyperelasticity/cpp/SConstruct
-	demo/pde/lift-drag/cpp/SConstruct
-	demo/pde/lift-drag/pressure.xml.gz
-	demo/pde/mixed-poisson/cpp/SConstruct
-	demo/pde/mixed-poisson/cpp/plot.py
-	demo/pde/neumann-poisson/cpp/SConstruct
-	demo/pde/nonlinear-poisson/cpp/SConstruct
-	demo/pde/nonlinear-poisson/cpp/plot.py
-	demo/pde/periodic/cpp/SConstruct
-	demo/pde/poisson/cpp/README
-	demo/pde/poisson/cpp/SConstruct
-	demo/pde/poisson1D/cpp/SConstruct
-	demo/pde/simple/cpp/SConstruct
-	demo/pde/simple/python/short.py
-	demo/pde/spatial-coordinates/cpp/SConstruct
-	demo/pde/stokes/mini/subdomains.xml.gz
-	demo/pde/stokes/stabilized/cpp/SConstruct
-	demo/pde/stokes/stabilized/cpp/plot.py
-	demo/pde/stokes/stabilized/subdomains.xml.gz
-	demo/pde/stokes/taylor-hood/cpp/SConstruct
-	demo/pde/stokes/taylor-hood/cpp/plot.py
-	demo/pde/stokes/taylor-hood/subdomains.xml.gz
-	demo/pde/sym-dirichlet-bc/cpp/SConstruct
-	demo/pde/tensor-weighted-poisson/cpp/README
-	demo/pde/tensor-weighted-poisson/python/c00.xml.gz
-	demo/pde/tensor-weighted-poisson/python/c11.xml.gz
-	demo/pde/waveguide/cpp/SConstruct
-	demo/pde/waveguide/waveguide_TM_cutoff_modes.pdf
-	demo/plot/cpp/SConstruct
-	demo/plot/cpp/dolfin-2.xml.gz
-	demo/plot/python/dolfin-2.xml.gz
-	demo/quadrature/cpp/SConstruct
-	doc/SConscript
+	demo/CMakeLists.txt
+	demo/cmake.local
+	demo/la/eigenvalue/cpp/CMakeLists.txt
+	demo/la/eigenvalue/python/box_with_dent.xml.gz
+	demo/pde/biharmonic/cpp/CMakeLists.txt
+	demo/pde/cahn-hilliard/cpp/CMakeLists.txt
+	demo/pde/hyperelasticity/cpp/CMakeLists.txt
+	demo/pde/mixed-poisson/cpp/CMakeLists.txt
+	demo/pde/navier-stokes/cpp/CMakeLists.txt
+	demo/pde/navier-stokes/cpp/lshape.xml.gz
+	demo/pde/navier-stokes/python/lshape.xml.gz
+	demo/pde/poisson/cpp/CMakeLists.txt
+	demo/undocumented/adaptive-poisson/cpp/CMakeLists.txt
+	demo/undocumented/adaptive-poisson/cpp/README
+	demo/undocumented/advection-diffusion/cpp/CMakeLists.txt
+	demo/undocumented/advection-diffusion/subdomains.xml.gz
+	demo/undocumented/advection-diffusion/velocity.xml.gz
+	demo/undocumented/ale/cpp/CMakeLists.txt
+	demo/undocumented/aliev-panfilov/cpp/CMakeLists.txt
+	demo/undocumented/aliev-panfilov/cpp/plot.py
+	demo/undocumented/assembly/cpp/CMakeLists.txt
+	demo/undocumented/assembly/python/README
+	demo/undocumented/bcs/cpp/CMakeLists.txt
+	demo/undocumented/bcs/cpp/aneurysm.xml.gz
+	demo/undocumented/bcs/python/aneurysm.xml.gz
+	demo/undocumented/block-matrix/cpp/CMakeLists.txt
+	demo/undocumented/built-in/cpp/CMakeLists.txt
+	demo/undocumented/collection/cpp/CMakeLists.txt
+	demo/undocumented/collection/cpp/plot.py
+	demo/undocumented/complex/cpp/CMakeLists.txt
+	demo/undocumented/complex/cpp/plot.py
+	demo/undocumented/conditional/cpp/CMakeLists.txt
+	demo/undocumented/courtemanche/cpp/CMakeLists.txt
+	demo/undocumented/courtemanche/cpp/plot.py
+	demo/undocumented/curl-curl/cpp/CMakeLists.txt
+	demo/undocumented/dg-advection-diffusion/cpp/CMakeLists.txt
+	demo/undocumented/dg-advection-diffusion/mesh.xml.gz
+	demo/undocumented/dg-advection-diffusion/python/functions2D.h
+	demo/undocumented/dg-poisson/cpp/CMakeLists.txt
+	demo/undocumented/dg-poisson/cpp/plot.py
+	demo/undocumented/dielectric/cpp/CMakeLists.txt
+	demo/undocumented/dielectric/cpp/README
+	demo/undocumented/distancequeries/cpp/CMakeLists.txt
+	demo/undocumented/distancequeries/python/README
+	demo/undocumented/elasticity/cpp/CMakeLists.txt
+	demo/undocumented/elasticity/cpp/gear.xml.gz
+	demo/undocumented/elasticity/cpp/plot.py
+	demo/undocumented/elasticity/python/gear.xml.gz
+	demo/undocumented/elastodynamics/cpp/CMakeLists.txt
+	demo/undocumented/entityintersection/cpp/CMakeLists.txt
+	demo/undocumented/equality/cpp/CMakeLists.txt
+	demo/undocumented/equality/python/README
+	demo/undocumented/eval/cpp/CMakeLists.txt
+	demo/undocumented/extrapolation/cpp/CMakeLists.txt
+	demo/undocumented/extrapolation/cpp/P1.ufl
+	demo/undocumented/extrapolation/cpp/P2.ufl
+	demo/undocumented/functional/cpp/CMakeLists.txt
+	demo/undocumented/harmonic/cpp/CMakeLists.txt
+	demo/undocumented/harmonic/cpp/plot.py
+	demo/undocumented/harmonic/cpp/plot_dual.py
+	demo/undocumented/interpolation/cpp/CMakeLists.txt
+	demo/undocumented/interpolation/cpp/README
+	demo/undocumented/lift-drag/cpp/CMakeLists.txt
+	demo/undocumented/lift-drag/pressure.xml.gz
+	demo/undocumented/lorenz/cpp/CMakeLists.txt
+	demo/undocumented/lorenz/cpp/plot.py
+	demo/undocumented/lorenz/cpp/stabilityfactors.py
+	demo/undocumented/meshfunction/cpp/CMakeLists.txt
+	demo/undocumented/meshfunction/cpp/plot.py
+	demo/undocumented/meshfunction/mesh2D.xml.gz
+	demo/undocumented/meshfunction/meshfunction.xml
+	demo/undocumented/meshintersection/2D/cpp/CMakeLists.txt
+	demo/undocumented/meshintersection/2D/python/rotator.xml.gz
+	demo/undocumented/meshintersection/3D/cpp/CMakeLists.txt
+	demo/undocumented/meshintersection/3D/cpp/README
+	demo/undocumented/method-weights/cpp/CMakeLists.txt
+	demo/undocumented/neumann-poisson/cpp/CMakeLists.txt
+	demo/undocumented/nonlinear-poisson/cpp/CMakeLists.txt
+	demo/undocumented/nonlinear-poisson/cpp/plot.py
+	demo/undocumented/nonmatching-interpolation/cpp/CMakeLists.txt
+	demo/undocumented/nonmatching-projection/cpp/CMakeLists.txt
+	demo/undocumented/parameters/cpp/CMakeLists.txt
+	demo/undocumented/parameters/cpp/parameters.xml
+	demo/undocumented/parameters/python/parameters.xml
+	demo/undocumented/partitioning/cpp/CMakeLists.txt
+	demo/undocumented/partitioning/cpp/plotpartitions
+	demo/undocumented/partitioning/cpp/unitsquare.xml.gz
+	demo/undocumented/partitioning/python/unitsquare.xml.gz
+	demo/undocumented/periodic/cpp/CMakeLists.txt
+	demo/undocumented/plot/cpp/CMakeLists.txt
+	demo/undocumented/plot/cpp/dolfin-2.xml.gz
+	demo/undocumented/plot/python/dolfin-2.xml.gz
+	demo/undocumented/poisson1D/cpp/CMakeLists.txt
+	demo/undocumented/projection-interpolation/cpp/CMakeLists.txt
+	demo/undocumented/projection-interpolation/cpp/README
+	demo/undocumented/quadrature/cpp/CMakeLists.txt
+	demo/undocumented/reaction-diffusion/cpp/CMakeLists.txt
+	demo/undocumented/reaction-diffusion/python/short.py
+	demo/undocumented/reaction/cpp/CMakeLists.txt
+	demo/undocumented/reaction/cpp/plot.py
+	demo/undocumented/refinement/cpp/CMakeLists.txt
+	demo/undocumented/restriction/cpp/CMakeLists.txt
+	demo/undocumented/restriction/cpp/README
+	demo/undocumented/simple/cpp/CMakeLists.txt
+	demo/undocumented/simple/tetrahedron.xml.gz
+	demo/undocumented/smoothing/cpp/CMakeLists.txt
+	demo/undocumented/smoothing/cpp/README
+	demo/undocumented/spatial-coordinates/cpp/CMakeLists.txt
+	demo/undocumented/stiff/cpp/CMakeLists.txt
+	demo/undocumented/stiff/cpp/plot.py
+	demo/undocumented/stiff/cpp/run-tests.sh
+	demo/undocumented/stokes-mini/subdomains.xml.gz
+	demo/undocumented/stokes-stabilized/cpp/CMakeLists.txt
+	demo/undocumented/stokes-stabilized/cpp/plot.py
+	demo/undocumented/stokes-stabilized/subdomains.xml.gz
+	demo/undocumented/stokes-taylor-hood/cpp/CMakeLists.txt
+	demo/undocumented/stokes-taylor-hood/cpp/plot.py
+	demo/undocumented/stokes-taylor-hood/subdomains.xml.gz
+	demo/undocumented/subdomains/cpp/CMakeLists.txt
+	demo/undocumented/submesh/cpp/CMakeLists.txt
+	demo/undocumented/sym-dirichlet-bc/cpp/CMakeLists.txt
+	demo/undocumented/tensor-weighted-poisson/cpp/CMakeLists.txt
+	demo/undocumented/tensor-weighted-poisson/cpp/README
+	demo/undocumented/tensor-weighted-poisson/python/c00.xml.gz
+	demo/undocumented/tensor-weighted-poisson/python/c11.xml.gz
+	demo/undocumented/time-series/cpp/CMakeLists.txt
+	demo/undocumented/waveguide/cpp/CMakeLists.txt
+	demo/undocumented/waveguide/waveguide_TM_cutoff_modes.pdf
 	doc/man/man1/dolfin-convert.1.gz
 	doc/man/man1/dolfin-order.1.gz
 	doc/manual/Makefile
@@ -237,12 +277,11 @@
 	doc/progr_reference/html/myfooter.inc
 	doc/progr_reference/html/myheader.inc
 	doc/progr_reference/tex/README
-	dolfin/SConscript
+	dolfin/CMakeLists.txt
 	dolfin/adaptivity/dolfin_adaptivity.h
 	dolfin/ale/dolfin_ale.h
 	dolfin/common/dolfin_common.h
 	dolfin/dolfin.h
-	dolfin/dolfin.pc.in
 	dolfin/fem/dolfin_fem.h
 	dolfin/function/dolfin_function.h
 	dolfin/graph/dolfin_graph.h
@@ -262,7 +301,7 @@
 	dolfin/parameter/dolfin_parameter.h
 	dolfin/plot/dolfin_plot.h
 	dolfin/quadrature/dolfin_quadrature.h
-	dolfin/scons.cfg
+	dolfin/swig/CMakeLists.txt
 	dolfin/swig/common_post.i
 	dolfin/swig/docstrings.i
 	dolfin/swig/function_post.i
@@ -288,84 +327,15 @@
 	dolfin/swig/io_post.i
 	dolfin/swig/kernel_modules.i
 	dolfin/swig/la_post.i
-	misc/gendoc.sh
-	misc/greeting/greeting.sh
-	misc/petsc.conf
-	misc/slepc.conf
-	misc/utils/convert/test_diffpack.grid
-	misc/utils/convert/test_exodus.exo
-	misc/utils/convert/test_gmsh.msh
-	misc/utils/convert/test_old_xml.xml
-	misc/utils/convert/test_tetgen.mesh
-	misc/utils/emacs/macros
-	misc/utils/inp2dx/inp2dx.c
-	misc/utils/inp2dx/inp2dxanim.c
-	misc/utils/matlab/writeinp.m
-	misc/utils/octave/README
-	misc/utils/opendx/dolfin.cfg
-	misc/utils/opendx/dolfin.net
-	misc/utils/order/mesh0.xml
-	misc/utils/order/mesh1.xml
-	misc/utils/python/README
-	misc/utils/swig/dolfin-swig
-	misc/utils/tetgen/sphere.stl
 	release.conf
-	scons.local
-	scons/simula-scons/AUTHORS
-	scons/simula-scons/README
-	scons/simula-scons/TODO
-	scons/simula-scons/setup.py
-	scons/simula-scons/simula_scons/Customize.py
-	scons/simula-scons/simula_scons/Errors.py
-	scons/simula-scons/simula_scons/__init__.py
-	scons/simula-scons/simula_scons/_module.py
-	scons/simula-scons/simula_scons/latex.py
-	scons/simula-scons/simula_scons/pkgconfig.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/__init__.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/armadillo.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/boost.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/boost_filesystem.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/boost_program_options.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/cgal.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/cholmod.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/gmp.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/hypre.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/boost/install.sh
-	scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/cmake/install.sh
-	scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/dolfin/install.sh
-	scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/hypre/install.sh
-	scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/pkgconfig/install.sh
-	scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/scotch/install.sh
-	scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/trilinos/install.sh
-	scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/ufc/install.sh
-	scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/vtk/install.sh
-	scons/simula-scons/simula_scons/pkgconfiggenerators/lapack.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/libxml.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/mtl4.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/numeric.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/numpy.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/parmetis.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/petsc.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/python.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/scotch.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/slepc.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/superlu.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/trilinos.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/umfpack.py
-	scons/simula-scons/simula_scons/pkgconfiggenerators/zlib.py
-	scripts/broken
-	scripts/dolfinreplace
-	scripts/fixme
-	scripts/klocs
-	scripts/makedoc
-	scripts/notinuse
-	scripts/pdebug
 	site-packages/dolfin/__init__.py
 	site-packages/dolfin/adaptivity/__init__.py
 	site-packages/dolfin/common/__init__.py
 	site-packages/dolfin/common/constants.py
 	site-packages/dolfin/common/dynamicloadmpi.py
 	site-packages/dolfin/common/logger.py
+	site-packages/dolfin/docstrings/__init__.py
+	site-packages/dolfin/docstrings/dolfin/__init__.py
 	site-packages/dolfin/fem/__init__.py
 	site-packages/dolfin/function/__init__.py
 	site-packages/dolfin/function/ufc_functionspace.py
@@ -373,17 +343,45 @@
 	site-packages/dolfin_utils/__init__.py
 	site-packages/dolfin_utils/pjobs/__init__.py
 	site-packages/dolfin_utils/wrappers/__init__.py
-	test/SConscript
+	test/CMakeLists.txt
+	test/README
 	test/memory/dolfin_valgrind.supp
 	test/regression/README
 	test/system/parallel-assembly-solve/unitcube.xml.gz
 	test/system/parallel-assembly-solve/unitsquare.xml.gz
+	test/unit/fem/cpp/CMakeLists.txt
+	test/unit/function/cpp/CMakeLists.txt
+	test/unit/io/cpp/CMakeLists.txt
+	test/unit/la/cpp/CMakeLists.txt
+	test/unit/mesh/cpp/CMakeLists.txt
+	test/unit/meshconvert/cpp/CMakeLists.txt
 	test/unit/meshconvert/python/data/abaqus.inp
 	test/unit/meshconvert/python/test.py
+	test/unit/quadrature/cpp/CMakeLists.txt
+	utils/convert/test_diffpack.grid
+	utils/convert/test_exodus.exo
+	utils/convert/test_gmsh.msh
+	utils/convert/test_old_xml.xml
+	utils/convert/test_tetgen.mesh
+	utils/emacs/macros
+	utils/octave/README
+	utils/order/mesh0.xml
+	utils/order/mesh1.xml
+	utils/python/README
+	utils/scripts/broken
+	utils/scripts/dolfinreplace
+	utils/scripts/fixme
+	utils/scripts/klocs
+	utils/scripts/makedoc
+	utils/scripts/notinuse
+	utils/scripts/pdebug
+	utils/swig/dolfin-swig
+	utils/tetgen/sphere.stl
 Copyright: *No copyright*
 License: UNKNOWN
 
-Files: bench/fem/assembly/cpp/forms/Elasticity3D.h
+Files: INSTALL
+	bench/fem/assembly/cpp/forms/Elasticity3D.h
 	bench/fem/assembly/cpp/forms/NSEMomentum3D.h
 	bench/fem/assembly/cpp/forms/Poisson2DP1.h
 	bench/fem/assembly/cpp/forms/Poisson2DP2.h
@@ -402,59 +400,64 @@
 	bench/fem/convergence/cpp/forms/Poisson3D_5.h
 	bench/fem/speedup/cpp/Poisson.h
 	bench/function/evaluation/cpp/P1.h
-	demo/adaptivity/extrapolation/cpp/P1.h
-	demo/adaptivity/extrapolation/cpp/P2.h
-	demo/fem/assembly/cpp/ReactionDiffusion.h
-	demo/fem/simple/cpp/MassMatrix3D.h
-	demo/fem/simple/cpp/StiffnessMatrix3D.h
-	demo/function/eval/cpp/Projection.h
-	demo/function/nonmatching-interpolation/cpp/P1.h
-	demo/function/nonmatching-interpolation/cpp/P3.h
-	demo/function/nonmatching-projection/cpp/P1_projection.h
-	demo/function/nonmatching-projection/cpp/P3.h
-	demo/la/block-matrix/cpp/StiffnessMatrix.h
-	demo/la/eigensolver/cpp/StiffnessMatrix.h
-	demo/pde/advection-diffusion/cpp/AdvectionDiffusion.h
-	demo/pde/advection-diffusion/cpp/Velocity.h
-	demo/pde/bcs/cpp/Poisson.h
+	cmake/modules/FindSLEPc.cmake
+	demo/la/eigenvalue/cpp/StiffnessMatrix.h
+	demo/pde/biharmonic/cpp/Biharmonic.h
 	demo/pde/cahn-hilliard/cpp/CahnHilliard2D.cpp
 	demo/pde/cahn-hilliard/cpp/CahnHilliard2D.h
 	demo/pde/cahn-hilliard/cpp/CahnHilliard3D.cpp
 	demo/pde/cahn-hilliard/cpp/CahnHilliard3D.h
-	demo/pde/curl-curl/cpp/CurrentDensity.h
-	demo/pde/curl-curl/cpp/EddyCurrents.h
-	demo/pde/dg/advection-diffusion/cpp/AdvectionDiffusion.h
-	demo/pde/dg/advection-diffusion/cpp/Projection.h
-	demo/pde/dg/advection-diffusion/cpp/Velocity.h
-	demo/pde/dg/biharmonic/cpp/Biharmonic.h
-	demo/pde/dg/poisson/cpp/Poisson.h
-	demo/pde/elasticity/cpp/Elasticity.h
-	demo/pde/elastodynamics/cpp/DG0_eps_xx.h
-	demo/pde/elastodynamics/cpp/ElastoDynamics.h
-	demo/pde/equality/cpp/Poisson.h
-	demo/pde/functional/cpp/EnergyNorm.h
 	demo/pde/hyperelasticity/cpp/HyperElasticity.h
-	demo/pde/lift-drag/cpp/Drag.h
-	demo/pde/lift-drag/cpp/Lift.h
-	demo/pde/lift-drag/cpp/Pressure.h
 	demo/pde/mixed-poisson/cpp/MixedPoisson.h
-	demo/pde/mixed-poisson/cpp/P1Projection.h
-	demo/pde/neumann-poisson/cpp/Poisson.h
-	demo/pde/nonlinear-poisson/cpp/NonlinearPoisson.h
-	demo/pde/periodic/cpp/Poisson.h
+	demo/pde/navier-stokes/cpp/PressureUpdate.h
+	demo/pde/navier-stokes/cpp/TentativeVelocity.h
+	demo/pde/navier-stokes/cpp/VelocityUpdate.h
 	demo/pde/poisson/cpp/Poisson.h
-	demo/pde/poisson1D/cpp/Poisson.h
-	demo/pde/simple/cpp/ReactionDiffusion.h
-	demo/pde/spatial-coordinates/cpp/SpatialCoordinates.h
-	demo/pde/stokes/stabilized/cpp/Stokes.h
-	demo/pde/stokes/taylor-hood/cpp/Stokes.h
-	demo/pde/sym-dirichlet-bc/cpp/Poisson.h
-	demo/pde/waveguide/cpp/Forms.h
+	demo/undocumented/advection-diffusion/cpp/AdvectionDiffusion.h
+	demo/undocumented/advection-diffusion/cpp/Velocity.h
+	demo/undocumented/assembly/cpp/ReactionDiffusion.h
+	demo/undocumented/bcs/cpp/Poisson.h
+	demo/undocumented/block-matrix/cpp/StiffnessMatrix.h
+	demo/undocumented/conditional/cpp/Conditional.h
+	demo/undocumented/curl-curl/cpp/CurrentDensity.h
+	demo/undocumented/curl-curl/cpp/EddyCurrents.h
+	demo/undocumented/dg-advection-diffusion/cpp/AdvectionDiffusion.h
+	demo/undocumented/dg-advection-diffusion/cpp/Projection.h
+	demo/undocumented/dg-advection-diffusion/cpp/Velocity.h
+	demo/undocumented/dg-poisson/cpp/Poisson.h
+	demo/undocumented/elasticity/cpp/Elasticity.h
+	demo/undocumented/elastodynamics/cpp/DG0_eps_xx.h
+	demo/undocumented/elastodynamics/cpp/ElastoDynamics.h
+	demo/undocumented/equality/cpp/Poisson.h
+	demo/undocumented/eval/cpp/Projection.h
+	demo/undocumented/extrapolation/cpp/P1.h
+	demo/undocumented/extrapolation/cpp/P2.h
+	demo/undocumented/functional/cpp/EnergyNorm.h
+	demo/undocumented/lift-drag/cpp/Drag.h
+	demo/undocumented/lift-drag/cpp/Lift.h
+	demo/undocumented/lift-drag/cpp/Pressure.h
+	demo/undocumented/neumann-poisson/cpp/Poisson.h
+	demo/undocumented/nonlinear-poisson/cpp/NonlinearPoisson.h
+	demo/undocumented/nonmatching-interpolation/cpp/P1.h
+	demo/undocumented/nonmatching-interpolation/cpp/P3.h
+	demo/undocumented/nonmatching-projection/cpp/P1_projection.h
+	demo/undocumented/nonmatching-projection/cpp/P3.h
+	demo/undocumented/periodic/cpp/Poisson.h
+	demo/undocumented/poisson1D/cpp/Poisson.h
+	demo/undocumented/reaction-diffusion/cpp/ReactionDiffusion.h
+	demo/undocumented/simple/cpp/MassMatrix3D.h
+	demo/undocumented/simple/cpp/StiffnessMatrix3D.h
+	demo/undocumented/spatial-coordinates/cpp/SpatialCoordinates.h
+	demo/undocumented/stokes-stabilized/cpp/Stokes.h
+	demo/undocumented/stokes-taylor-hood/cpp/Stokes.h
+	demo/undocumented/sym-dirichlet-bc/cpp/Poisson.h
+	demo/undocumented/waveguide/cpp/Forms.h
 	doc/manual/chapters/contributing.tex
 	doc/progr_reference/html/Doxyfile
 	dolfin/ale/Poisson1D.h
 	dolfin/ale/Poisson2D.h
 	dolfin/ale/Poisson3D.h
+	site-packages/dolfin/docstrings/dolfin/cpp.py
 	test/unit/function/cpp/Projection.h
 Copyright: *No copyright*
 License: UNKNOWN (GENERATED FILE)
@@ -463,13 +466,13 @@
 	bench/fem/speedup/cpp/analyse-bench
 	bench/fem/speedup/cpp/assemble-poisson.cpp
 	bench/fem/speedup/cpp/solve-poisson.cpp
-	demo/adaptivity/time-series/cpp/main.cpp
-	demo/adaptivity/time-series/python/demo.py
-	demo/mesh/submesh/cpp/main.cpp
-	demo/mesh/submesh/python/demo.py
-	demo/ode/collection/cpp/main.cpp
-	demo/pde/simple/cpp/main.cpp
-	demo/pde/simple/python/demo.py
+	demo/undocumented/collection/cpp/main.cpp
+	demo/undocumented/reaction-diffusion/cpp/main.cpp
+	demo/undocumented/reaction-diffusion/python/demo.py
+	demo/undocumented/submesh/cpp/main.cpp
+	demo/undocumented/submesh/python/demo.py
+	demo/undocumented/time-series/cpp/main.cpp
+	demo/undocumented/time-series/python/demo.py
 	dolfin/adaptivity/Extrapolation.cpp
 	dolfin/adaptivity/Extrapolation.h
 	dolfin/adaptivity/TimeSeries.cpp
@@ -485,7 +488,6 @@
 	dolfin/function/GenericFunction.h
 	dolfin/io/BinaryFile.cpp
 	dolfin/io/BinaryFile.h
-	dolfin/la/lapack.h
 	dolfin/mesh/SubMesh.cpp
 	dolfin/mesh/SubMesh.h
 	dolfin/parameter/GlobalParameters.cpp
@@ -497,8 +499,6 @@
 	dolfin/plot/FunctionPlotData.cpp
 	dolfin/plot/FunctionPlotData.h
 	dolfin/swig/fem_pre.i
-	misc/utils/tetgen/dolfin-tetgen
-	scripts/formatcode
 	site-packages/dolfin/fem/bcs.py
 	site-packages/dolfin/fem/interpolate.py
 	site-packages/dolfin/mesh/ale.py
@@ -508,19 +508,20 @@
 	test/system/parallel-assembly-solve/test.py
 	test/system/test.py
 	test/unit/python-extras/python/test.py
+	utils/scripts/formatcode
+	utils/tetgen/dolfin-tetgen
 Copyright: 2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/fem/assembly/cpp/ReactionDiffusion.ufl
-	demo/function/eval/cpp/Projection.ufl
-	demo/function/eval/cpp/main.cpp
-	demo/function/eval/python/demo.py
-	demo/function/projection-interpolation/python/demo.py
-	demo/ode/harmonic/cpp/main_solvedual.cpp
-	demo/pde/bcs/cpp/Poisson.ufl
-	demo/pde/bcs/cpp/main.cpp
-	demo/pde/bcs/python/demo.py
-	demo/pde/optimization/python/demo.py
+Files: demo/undocumented/assembly/cpp/ReactionDiffusion.ufl
+	demo/undocumented/bcs/cpp/Poisson.ufl
+	demo/undocumented/bcs/cpp/main.cpp
+	demo/undocumented/bcs/python/demo.py
+	demo/undocumented/eval/cpp/Projection.ufl
+	demo/undocumented/eval/cpp/main.cpp
+	demo/undocumented/eval/python/demo.py
+	demo/undocumented/optimization/python/demo.py
+	demo/undocumented/projection-interpolation/python/demo.py
 	dolfin/ale/HarmonicSmoothing.cpp
 	dolfin/ale/HarmonicSmoothing.h
 	dolfin/ale/Poisson1D.ufl
@@ -540,12 +541,12 @@
 	dolfin/mesh/DynamicMeshEditor.cpp
 	dolfin/mesh/DynamicMeshEditor.h
 	dolfin/mesh/MeshSmoothing.cpp
-	misc/utils/order/dolfin-order
-	misc/utils/python/extract2d
 	site-packages/dolfin/fem/errornorm.py
 	site-packages/dolfin/fem/norm.py
 	test/unit/function/cpp/Projection.form
 	test/unit/function/cpp/Projection.ufl
+	utils/order/dolfin-order
+	utils/python/extract2d
 Copyright: 2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -559,14 +560,13 @@
 	bench/fem/convergence/cpp/forms/Poisson3D_3.ufl
 	bench/fem/convergence/cpp/forms/Poisson3D_4.ufl
 	bench/fem/convergence/cpp/forms/Poisson3D_5.ufl
-	demo/fem/simple/cpp/MassMatrix3D.ufl
-	demo/fem/simple/cpp/StiffnessMatrix3D.ufl
-	demo/la/block-matrix/cpp/StiffnessMatrix.ufl
-	demo/la/eigensolver/cpp/StiffnessMatrix.ufl
-	demo/ode/complex/cpp/main.cpp
-	demo/pde/functional/cpp/EnergyNorm.ufl
-	dolfin/la/PETScKrylovMatrix.cpp
-	dolfin/la/PETScKrylovMatrix.h
+	demo/la/eigenvalue/cpp/StiffnessMatrix.ufl
+	demo/undocumented/block-matrix/cpp/StiffnessMatrix.ufl
+	demo/undocumented/complex/cpp/main.cpp
+	demo/undocumented/functional/cpp/EnergyNorm.ufl
+	demo/undocumented/simple/cpp/MassMatrix3D.ufl
+	demo/undocumented/simple/cpp/StiffnessMatrix3D.ufl
+	dolfin/la/PETScBaseMatrix.h
 	dolfin/la/PETScLUSolver.h
 	dolfin/main/init.cpp
 	dolfin/mesh/UnitCircle.h
@@ -585,34 +585,34 @@
 Copyright: 2005-2006, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/fem/simple/python/demo.py
-	demo/la/eigensolver/python/demo.py
-	demo/mesh/meshfunction/python/demo.py
-	demo/mesh/subdomains/python/demo.py
-	demo/ode/aliev-panfilov/python/demo.py
-	demo/pde/advection-diffusion/python/demo.py
-	demo/pde/dg/poisson/python/demo.py
-	demo/pde/elasticity/python/demo.py
-	demo/pde/functional/python/demo.py
-	demo/pde/lift-drag/python/demo.py
+Files: demo/la/eigenvalue/python/demo.py
 	demo/pde/mixed-poisson/python/demo.py
-	demo/pde/nonlinear-poisson/python/demo.py
-	demo/pde/periodic/python/demo.py
-	demo/pde/poisson1D/cpp/Poisson.ufl
-	demo/pde/poisson1D/cpp/main.cpp
-	demo/pde/poisson1D/python/demo.py
-	demo/pde/stokes/mini/python/demo.py
-	demo/pde/stokes/stabilized/python/demo.py
-	demo/pde/stokes/taylor-hood/python/demo.py
-	demo/quadrature/python/demo.py
+	demo/undocumented/advection-diffusion/python/demo.py
+	demo/undocumented/aliev-panfilov/python/demo.py
+	demo/undocumented/dg-poisson/python/demo.py
+	demo/undocumented/elasticity/python/demo.py
+	demo/undocumented/functional/python/demo.py
+	demo/undocumented/lift-drag/python/demo.py
+	demo/undocumented/meshfunction/python/demo.py
+	demo/undocumented/nonlinear-poisson/python/demo.py
+	demo/undocumented/periodic/python/demo.py
+	demo/undocumented/poisson1D/cpp/Poisson.ufl
+	demo/undocumented/poisson1D/cpp/main.cpp
+	demo/undocumented/poisson1D/python/demo.py
+	demo/undocumented/quadrature/python/demo.py
+	demo/undocumented/simple/python/demo.py
+	demo/undocumented/stokes-mini/python/demo.py
+	demo/undocumented/stokes-stabilized/python/demo.py
+	demo/undocumented/stokes-taylor-hood/python/demo.py
+	demo/undocumented/subdomains/python/demo.py
 	dolfin/mesh/Interval.cpp
 	dolfin/mesh/Interval.h
 	dolfin/mesh/UnitInterval.h
 Copyright: 2007, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
 License: LGPL-2.1
 
-Files: demo/mesh/intersection/entityintersection/python/demo.py
-	demo/mesh/intersection/meshintersection/3D/python/demo.py
+Files: demo/undocumented/entityintersection/python/demo.py
+	demo/undocumented/meshintersection/3D/python/demo.py
 	dolfin/mesh/IntersectionOperator.cpp
 	dolfin/mesh/IntersectionOperator.h
 	dolfin/mesh/IntersectionOperatorImplementation.h
@@ -661,34 +661,10 @@
 Copyright: 2009, Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
 
-Files: demo/mesh/refinement/cpp/main.cpp
-	demo/pde/equality/cpp/main.cpp
-	demo/pde/poisson/cpp/main.cpp
-	dolfin/function/Constant.cpp
-	dolfin/function/Constant.h
-	dolfin/function/SpecialFunctions.cpp
-	dolfin/function/SpecialFunctions.h
-	dolfin/mesh/Cell.h
-	dolfin/mesh/CellType.cpp
-	dolfin/mesh/CellType.h
-	dolfin/mesh/Mesh.cpp
-	dolfin/mesh/Mesh.h
-	dolfin/mesh/MeshEditor.cpp
-	dolfin/mesh/MeshEditor.h
-	dolfin/mesh/MeshEntity.cpp
-	dolfin/mesh/MeshEntity.h
-	dolfin/mesh/MeshFunction.h
-	dolfin/mesh/MeshTopology.cpp
-	dolfin/mesh/MeshTopology.h
-	dolfin/swig/mesh_post.i
-	dolfin/swig/mesh_pre.i
-Copyright: 2006-2009, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/mesh/subdomains/cpp/main.cpp
-	demo/pde/lift-drag/cpp/main.cpp
-	demo/pde/periodic/cpp/main.cpp
-	demo/plot/python/demo.py
+Files: demo/undocumented/lift-drag/cpp/main.cpp
+	demo/undocumented/periodic/cpp/main.cpp
+	demo/undocumented/plot/python/demo.py
+	demo/undocumented/subdomains/cpp/main.cpp
 	dolfin/fem/BoundaryCondition.cpp
 	dolfin/fem/BoundaryCondition.h
 	dolfin/fem/PeriodicBC.cpp
@@ -732,11 +708,34 @@
 Copyright: 2005-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/ode/aliev-panfilov/cpp/main.cpp
-	demo/pde/advection-diffusion/cpp/main.cpp
-	demo/pde/functional/cpp/main.cpp
-	demo/pde/stokes/stabilized/cpp/main.cpp
-	demo/pde/stokes/taylor-hood/cpp/main.cpp
+Files: demo/pde/poisson/cpp/main.cpp
+	demo/undocumented/equality/cpp/main.cpp
+	demo/undocumented/refinement/cpp/main.cpp
+	dolfin/function/Constant.cpp
+	dolfin/function/Constant.h
+	dolfin/function/SpecialFunctions.cpp
+	dolfin/function/SpecialFunctions.h
+	dolfin/mesh/CellType.cpp
+	dolfin/mesh/CellType.h
+	dolfin/mesh/Mesh.cpp
+	dolfin/mesh/Mesh.h
+	dolfin/mesh/MeshEditor.cpp
+	dolfin/mesh/MeshEditor.h
+	dolfin/mesh/MeshEntity.cpp
+	dolfin/mesh/MeshEntity.h
+	dolfin/mesh/MeshFunction.h
+	dolfin/mesh/MeshTopology.cpp
+	dolfin/mesh/MeshTopology.h
+	dolfin/swig/mesh_post.i
+	dolfin/swig/mesh_pre.i
+Copyright: 2006-2009, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/advection-diffusion/cpp/main.cpp
+	demo/undocumented/aliev-panfilov/cpp/main.cpp
+	demo/undocumented/functional/cpp/main.cpp
+	demo/undocumented/stokes-stabilized/cpp/main.cpp
+	demo/undocumented/stokes-taylor-hood/cpp/main.cpp
 	dolfin/mesh/BoundaryComputation.cpp
 	dolfin/mesh/BoundaryComputation.h
 	dolfin/mesh/BoundaryMesh.cpp
@@ -750,51 +749,51 @@
 	dolfin/mesh/TetrahedronCell.h
 	dolfin/mesh/TopologyComputation.cpp
 	dolfin/mesh/TriangleCell.h
-	dolfin/mesh/Vertex.h
 Copyright: 2006-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/function/restriction/python/demo.py
-	demo/la/block-matrix/cpp/main.cpp
-	demo/la/block-matrix/python/demo.py
-	demo/pde/sym-dirichlet-bc/python/demo.py
-	demo/pde/sym-dirichlet-bc/python/dg-demo.py
-	demo/pde/sym-dirichlet-bc/python/dg-speed-up-test.py
-	demo/pde/sym-dirichlet-bc/python/speed-up-test.py
-	dolfin/la/BlockMatrix.cpp
-	dolfin/la/BlockMatrix.h
-	dolfin/la/BlockVector.cpp
-	dolfin/la/BlockVector.h
-	dolfin/la/EpetraKrylovSolver.cpp
-	dolfin/la/EpetraKrylovSolver.h
-	dolfin/la/EpetraLUSolver.h
-	site-packages/dolfin/mesh/boundarysubdomainfinder.py
-	test/unit/restriction/python/test.py
-Copyright: 2008, Kent-Andre Mardal <kent-and at simula.no>
-License: LGPL-2.1
-
 Files: bench/function/evaluation/cpp/P1.ufl
-	demo/function/nonmatching-interpolation/cpp/P1.ufl
-	demo/function/nonmatching-interpolation/cpp/P3.ufl
-	demo/function/nonmatching-interpolation/cpp/main.cpp
-	demo/function/nonmatching-interpolation/python/demo.py
-	demo/function/nonmatching-projection/cpp/P1_projection.ufl
-	demo/function/nonmatching-projection/cpp/P3.ufl
-	demo/function/nonmatching-projection/cpp/main.cpp
-	demo/function/nonmatching-projection/python/demo.py
-	demo/pde/advection-diffusion/cpp/Velocity.ufl
 	demo/pde/cahn-hilliard/python/demo.py
-	demo/pde/dg/advection-diffusion/cpp/Velocity.ufl
-	demo/pde/lift-drag/cpp/Pressure.ufl
+	demo/undocumented/advection-diffusion/cpp/Velocity.ufl
+	demo/undocumented/dg-advection-diffusion/cpp/Velocity.ufl
+	demo/undocumented/lift-drag/cpp/Pressure.ufl
+	demo/undocumented/nonmatching-interpolation/cpp/P1.ufl
+	demo/undocumented/nonmatching-interpolation/cpp/P3.ufl
+	demo/undocumented/nonmatching-interpolation/cpp/main.cpp
+	demo/undocumented/nonmatching-interpolation/python/demo.py
+	demo/undocumented/nonmatching-projection/cpp/P1_projection.ufl
+	demo/undocumented/nonmatching-projection/cpp/P3.ufl
+	demo/undocumented/nonmatching-projection/cpp/main.cpp
+	demo/undocumented/nonmatching-projection/python/demo.py
 	dolfin/io/Encoder.h
 	test/unit/fem/cpp/test.cpp
 	test/unit/fem/python/test.py
 Copyright: 2009, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/ode/reaction/cpp/main.cpp
-	demo/pde/neumann-poisson/cpp/Poisson.ufl
+Files: cmake/scripts/generate-cmakefiles
+	demo/undocumented/elastodynamics/python/demo.py
+	demo/undocumented/stokes-iterative/python/demo.py
+	dolfin/graph/GraphBuilder.cpp
+	dolfin/graph/GraphBuilder.h
+	dolfin/graph/SCOTCH.cpp
+	dolfin/graph/SCOTCH.h
+	dolfin/io/VTKWriter.cpp
+	dolfin/io/VTKWriter.h
+	dolfin/la/GenericLUSolver.h
+	dolfin/la/PETScPreconditioner.cpp
+	dolfin/la/PETScPreconditioner.h
+	dolfin/la/TrilinosPreconditioner.cpp
+	dolfin/la/TrilinosPreconditioner.h
+	dolfin/mesh/refine.cpp
+	dolfin/mesh/refine.h
+Copyright: 2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: cmake/scripts/generate-form-files
 	demo/pde/poisson/cpp/Poisson.ufl
+	demo/undocumented/neumann-poisson/cpp/Poisson.ufl
+	demo/undocumented/reaction/cpp/main.cpp
 	dolfin/la/PETScLUSolver.cpp
 	dolfin/mesh/Box.h
 	dolfin/mesh/Rectangle.cpp
@@ -806,13 +805,12 @@
 	dolfin/ode/MultiAdaptiveNewtonSolver.cpp
 	dolfin/ode/TimeSlab.h
 	dolfin/ode/TimeSlabSolver.cpp
-	scripts/compileforms
 Copyright: 2005-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/mesh/refinement/python/demo.py
-	demo/pde/poisson/python/demo.py
-	demo/pde/tensor-weighted-poisson/python/generate_data.py
+Files: demo/pde/poisson/python/demo.py
+	demo/undocumented/refinement/python/demo.py
+	demo/undocumented/tensor-weighted-poisson/python/generate_data.py
 	dolfin/fem/Assembler.cpp
 	dolfin/fem/Assembler.h
 	dolfin/fem/AssemblerTools.cpp
@@ -828,6 +826,24 @@
 Copyright: 2007-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
+Files: demo/undocumented/block-matrix/cpp/main.cpp
+	demo/undocumented/block-matrix/python/demo.py
+	demo/undocumented/restriction/python/demo.py
+	demo/undocumented/sym-dirichlet-bc/python/demo.py
+	demo/undocumented/sym-dirichlet-bc/python/dg-demo.py
+	demo/undocumented/sym-dirichlet-bc/python/dg-speed-up-test.py
+	demo/undocumented/sym-dirichlet-bc/python/speed-up-test.py
+	dolfin/la/BlockMatrix.cpp
+	dolfin/la/BlockMatrix.h
+	dolfin/la/BlockVector.cpp
+	dolfin/la/BlockVector.h
+	dolfin/la/EpetraKrylovSolver.cpp
+	dolfin/la/EpetraKrylovSolver.h
+	site-packages/dolfin/mesh/boundarysubdomainfinder.py
+	test/unit/restriction/python/test.py
+Copyright: 2008, Kent-Andre Mardal <kent-and at simula.no>
+License: LGPL-2.1
+
 Files: dolfin/la/uBLASDummyPreconditioner.cpp
 	dolfin/la/uBLASDummyPreconditioner.h
 	dolfin/la/uBLASKrylovMatrix.cpp
@@ -838,10 +854,10 @@
 	dolfin/mesh/MeshGeometry.cpp
 	dolfin/mesh/MeshGeometry.h
 	dolfin/mesh/TopologyComputation.h
-	misc/utils/convert/dolfin-convert
-	misc/utils/xml/convertall
 	site-packages/dolfin/mesh/meshconvert.py
 	test/unit/mesh/python/test.py
+	utils/convert/dolfin-convert
+	utils/xml/convertall
 Copyright: 2006, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -862,9 +878,9 @@
 Copyright: 2008-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/ode/lorenz/cpp/main.cpp
-	demo/ode/stiff/cpp/TestProblem3.h
-	demo/ode/stiff/cpp/TestProblem7.h
+Files: demo/undocumented/lorenz/cpp/main.cpp
+	demo/undocumented/stiff/cpp/TestProblem3.h
+	demo/undocumented/stiff/cpp/TestProblem7.h
 	dolfin/math/Lagrange.cpp
 	dolfin/math/Legendre.cpp
 	dolfin/ode/Dependencies.cpp
@@ -909,22 +925,37 @@
 Copyright: 2003-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/elastodynamics/python/demo.py
-	dolfin/graph/GraphBuilder.cpp
-	dolfin/graph/GraphBuilder.h
-	dolfin/graph/SCOTCH.cpp
-	dolfin/graph/SCOTCH.h
-	dolfin/la/PETScPreconditioner.cpp
-	dolfin/la/PETScPreconditioner.h
-	dolfin/la/TrilinosPreconditioner.cpp
-	dolfin/la/TrilinosPreconditioner.h
-	dolfin/mesh/refine.cpp
-	dolfin/mesh/refine.h
-Copyright: 2010, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/ode/method-weights/cpp/main.cpp
-	demo/quadrature/cpp/main.cpp
+Files: bench/mesh/iteration/cpp/main.cpp
+	bench/mesh/refinement/cpp/main.cpp
+	bench/mesh/unitcube/cpp/main.cpp
+	demo/pde/mixed-poisson/cpp/MixedPoisson.ufl
+	dolfin/mesh/Cell.h
+	dolfin/mesh/Edge.h
+	dolfin/mesh/Face.h
+	dolfin/mesh/Facet.h
+	dolfin/mesh/TriangleCell.cpp
+	dolfin/mesh/UniformMeshRefinement.cpp
+	dolfin/mesh/UniformMeshRefinement.h
+	dolfin/mesh/Vertex.h
+Copyright: 2006-2010, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: bench/bench.py
+	bench/la/vector/access/cpp/main.cpp
+	demo/pde/navier-stokes/cpp/PressureUpdate.ufl
+	demo/pde/navier-stokes/cpp/TentativeVelocity.ufl
+	demo/pde/navier-stokes/cpp/VelocityUpdate.ufl
+	demo/pde/navier-stokes/cpp/main.cpp
+	demo/undocumented/extrapolation/cpp/main.cpp
+	dolfin/la/GenericMatrix.cpp
+	dolfin/mesh/FacetCell.cpp
+	dolfin/mesh/FacetCell.h
+	site-packages/dolfin/mesh/meshfunction.py
+Copyright: 2010, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: demo/undocumented/method-weights/cpp/main.cpp
+	demo/undocumented/quadrature/cpp/main.cpp
 	dolfin/log/LogManager.cpp
 	dolfin/math/Lagrange.h
 	dolfin/math/basic.cpp
@@ -936,35 +967,9 @@
 Copyright: 2003-2005, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/advection-diffusion/cpp/AdvectionDiffusion.ufl
-	demo/pde/sym-dirichlet-bc/cpp/main.cpp
-	demo/plot/cpp/main.cpp
-	dolfin/mesh/Edge.h
-	dolfin/mesh/Face.h
-	dolfin/mesh/Facet.h
-	dolfin/mesh/MeshConnectivity.cpp
-	dolfin/mesh/MeshConnectivity.h
-	dolfin/mesh/MeshEntityIterator.cpp
-	test/unit/test.py
-Copyright: 2006-2007, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: demo/pde/cahn-hilliard/cpp/CahnHilliard2D.ufl
-	demo/pde/cahn-hilliard/cpp/CahnHilliard3D.ufl
-	dolfin/la/GenericMatrix.h
-	dolfin/la/GenericVector.h
-	dolfin/la/uBLASILUPreconditioner.cpp
-	dolfin/la/uBLASILUPreconditioner.h
-	dolfin/la/uBLASKrylovSolver.cpp
-	dolfin/la/uBLASKrylovSolver.h
-	dolfin/la/uBLASMatrix.h
-	dolfin/la/uBLASPreconditioner.h
-Copyright: 2006-2009, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/pde/lift-drag/cpp/Drag.ufl
-	demo/pde/lift-drag/cpp/Lift.ufl
-	demo/pde/periodic/cpp/Poisson.ufl
+Files: demo/undocumented/lift-drag/cpp/Drag.ufl
+	demo/undocumented/lift-drag/cpp/Lift.ufl
+	demo/undocumented/periodic/cpp/Poisson.ufl
 	dolfin/common/unittest.h
 	dolfin/fem/UFCMesh.h
 	dolfin/swig/generate.py
@@ -981,9 +986,9 @@
 	dolfin/ode/Controller.h
 	dolfin/ode/MonoAdaptivity.h
 	dolfin/ode/TimeSlabSolver.h
-	misc/utils/matlab/meshindex.m
-	misc/utils/matlab/plotcontroller.m
-	misc/utils/system/monitor
+	utils/matlab/meshindex.m
+	utils/matlab/plotcontroller.m
+	utils/system/monitor
 Copyright: 2005, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -998,8 +1003,8 @@
 Copyright: 2009, - Marie E. Rognes
 License: GPL-3+
 
-Files: demo/ode/stiff/cpp/TestProblem9.h
-	demo/ode/stiff/cpp/main.cpp
+Files: demo/undocumented/stiff/cpp/TestProblem9.h
+	demo/undocumented/stiff/cpp/main.cpp
 	dolfin/io/XMLObject.h
 	dolfin/ode/dGqMethod.h
 	dolfin/quadrature/LobattoQuadrature.cpp
@@ -1020,6 +1025,17 @@
 Copyright: 2006, Johan Hoffman <hoffman at csc.kth.se>
 License: LGPL-2.1
 
+Files: dolfin/la/GenericMatrix.h
+	dolfin/la/GenericVector.h
+	dolfin/la/uBLASILUPreconditioner.cpp
+	dolfin/la/uBLASILUPreconditioner.h
+	dolfin/la/uBLASKrylovSolver.cpp
+	dolfin/la/uBLASKrylovSolver.h
+	dolfin/la/uBLASMatrix.h
+	dolfin/la/uBLASPreconditioner.h
+Copyright: 2006-2009, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
 Files: dolfin/la/EpetraFactory.cpp
 	dolfin/la/EpetraFactory.h
 	dolfin/la/EpetraMatrix.cpp
@@ -1031,6 +1047,37 @@
 Copyright: 2008, Martin Sandve Alnes <martinal at simula.no>, Kent-Andre Mardal <kent-and at simula.no> and Johannes Ring <johannr at simula.no>
 License: LGPL-2.1
 
+Files: demo/undocumented/advection-diffusion/mesh.xml.gz
+	demo/undocumented/elastodynamics/cpp/dolfin-2.xml.gz
+	demo/undocumented/elastodynamics/python/dolfin-2.xml.gz
+	demo/undocumented/lift-drag/mesh.xml.gz
+	demo/undocumented/stokes-taylor-hood/dolfin-2.xml.gz
+	demo/undocumented/stokes-taylor-hood/python/dolfin-2.xml.gz
+	demo/undocumented/subdomains/cpp/dolfin-2.xml.gz
+	demo/undocumented/subdomains/python/dolfin-2.xml.gz
+Copyright: :!n&^B*MBfS+k.HE9J).\B*MfSo~u_cMBQ!f?=?YYaWul=>TxZCP_2t(/&Xa[u4F`J5<{4hXzB2m60Q\;f6;>IqfDj*LR.VIT%aI v:=E1mzb'0173?3#z+FL
+License: UNKNOWN
+
+Files: demo/undocumented/advection-diffusion/cpp/AdvectionDiffusion.ufl
+	demo/undocumented/plot/cpp/main.cpp
+	demo/undocumented/sym-dirichlet-bc/cpp/main.cpp
+	dolfin/mesh/MeshConnectivity.cpp
+	dolfin/mesh/MeshConnectivity.h
+	dolfin/mesh/MeshEntityIterator.cpp
+	test/unit/test.py
+Copyright: 2006-2007, Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
+Files: bench/fem/speedup/cpp/bench
+	demo/pde/navier-stokes/python/demo.py
+	demo/undocumented/extrapolation/python/demo.py
+	demo/undocumented/extrapolation/python/demo2.py
+	demo/undocumented/interpolation/python/demo.py
+	demo/undocumented/smoothing/python/demo.py
+	site-packages/dolfin/common/memory.py
+Copyright: 2010, + __author__
+License: LGPL-2.1
+
 Files: dolfin/ode/ODE.cpp
 	dolfin/ode/ODE.h
 	dolfin/ode/ODESolver.cpp
@@ -1040,24 +1087,6 @@
 Copyright: 2003-2009, Johan Jansson <johanjan at math.chalmers.se> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: bench/mesh/iteration/cpp/main.cpp
-	bench/mesh/refinement/cpp/main.cpp
-	bench/mesh/unitcube/cpp/main.cpp
-	dolfin/mesh/TriangleCell.cpp
-	dolfin/mesh/UniformMeshRefinement.cpp
-	dolfin/mesh/UniformMeshRefinement.h
-Copyright: 2006-2010, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/fem/SparsityPatternBuilder.cpp
-	dolfin/la/KrylovSolver.cpp
-	dolfin/la/KrylovSolver.h
-	dolfin/la/LUSolver.h
-	dolfin/la/SparsityPattern.cpp
-	dolfin/la/SparsityPattern.h
-Copyright: 2007-2009, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
 Files: dolfin/la/MTL4Factory.cpp
 	dolfin/la/MTL4Factory.h
 	dolfin/la/MTL4Matrix.cpp
@@ -1067,40 +1096,13 @@
 Copyright: 2008, Dag Lindbo <dag at csc.kth.se>
 License: LGPL-2.1
 
-Files: demo/mesh/built-in/python/demo.py
-	demo/pde/mixed-poisson/cpp/P1Projection.ufl
-	dolfin/common/NoDeleter.h
-	dolfin/la/PETScObject.h
-	dolfin/main/SubSystemsManager.cpp
-	dolfin/main/SubSystemsManager.h
-Copyright: 2008, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/pde/curl-curl/cpp/CurrentDensity.ufl
-	demo/pde/curl-curl/cpp/EddyCurrents.ufl
-	demo/pde/curl-curl/cpp/main.cpp
-	demo/pde/curl-curl/python/demo.py
+Files: demo/undocumented/curl-curl/cpp/CurrentDensity.ufl
+	demo/undocumented/curl-curl/cpp/EddyCurrents.ufl
+	demo/undocumented/curl-curl/cpp/main.cpp
+	demo/undocumented/curl-curl/python/demo.py
 	dolfin/fem/EqualityBC.cpp
 	dolfin/fem/EqualityBC.h
 Copyright: 2009, Bartosz Sawicki
-License: LGPL-2.1
-
-Files: bench/fem/speedup/cpp/bench
-	demo/adaptivity/extrapolation/python/demo.py
-	demo/adaptivity/extrapolation/python/demo2.py
-	demo/adaptivity/interpolation/python/demo.py
-	demo/mesh/smoothing/python/demo.py
-	site-packages/dolfin/common/memory.py
-Copyright: 2010, + __author__
-License: LGPL-2.1
-
-Files: bench/bench.py
-	bench/la/vector/access/cpp/main.cpp
-	demo/adaptivity/extrapolation/cpp/main.cpp
-	dolfin/la/GenericMatrix.cpp
-	dolfin/mesh/FacetCell.cpp
-	dolfin/mesh/FacetCell.h
-Copyright: 2010, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
 Files: demo/pde/cahn-hilliard/cpp/main.cpp
@@ -1119,15 +1121,15 @@
 Copyright: 2008, Benjamin Kehlet <benjamik at student.matnat.uio.no>
 License: LGPL-2.1
 
-Files: demo/pde/dg/advection-diffusion/python/demo.py
-	demo/pde/hyperelasticity/python/demo.py
-	site-packages/dolfin/fem/form.py
-	site-packages/dolfin/function/functionspace.py
-	test/unit/la/python/test.py
-Copyright: 2008, Johan Hake <hake at simula.no>
-License: LGPL-2.1
-
-Files: demo/mesh/ale/cpp/main.cpp
+Files: demo/undocumented/built-in/python/demo.py
+	dolfin/common/NoDeleter.h
+	dolfin/la/PETScObject.h
+	dolfin/main/SubSystemsManager.cpp
+	dolfin/main/SubSystemsManager.h
+Copyright: 2008, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: demo/undocumented/ale/cpp/main.cpp
 	dolfin/ale/ALE.cpp
 	dolfin/ale/ALE.h
 	dolfin/ale/TransfiniteInterpolation.cpp
@@ -1143,45 +1145,38 @@
 Copyright: 2009, Anders Logg <logg at simula.no> and Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
 
-Files: demo/adaptivity/pde/energy-norm-poisson.py
-	demo/adaptivity/pde/poisson.py
+Files: demo/undocumented/adaptive-pde/energy-norm-poisson.py
+	demo/undocumented/adaptive-pde/poisson.py
 	site-packages/dolfin/adaptivity/adaptivedata.py
 	site-packages/dolfin/adaptivity/updates.py
 Copyright: 2010, Marie E. Rognes
 License: GPL-3+
 
-Files: dolfin/io/GenericFile.h
-	dolfin/io/MFile.cpp
-	dolfin/io/MFile.h
-	dolfin/io/MatlabFile.cpp
-Copyright: 2003-2008, Johan Hoffman <hoffman at csc.kth.se> and Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
 Files: dolfin/la/PETScKrylovSolver.h
-	misc/utils/octave/pdemesh.m
-	misc/utils/octave/pdeplot.m
-	misc/utils/octave/pdesurf.m
+	utils/octave/pdemesh.m
+	utils/octave/pdeplot.m
+	utils/octave/pdesurf.m
 Copyright: 2004-2005, Johan Jansson <johanjan at math.chalmers.se>
 License: LGPL-2.1
 
-Files: demo/ode/stiff/cpp/TestProblem1.h
-	demo/ode/stiff/cpp/TestProblem4.h
-	demo/ode/stiff/cpp/TestProblem5.h
-	demo/ode/stiff/cpp/TestProblem6.h
+Files: demo/undocumented/stiff/cpp/TestProblem1.h
+	demo/undocumented/stiff/cpp/TestProblem4.h
+	demo/undocumented/stiff/cpp/TestProblem5.h
+	demo/undocumented/stiff/cpp/TestProblem6.h
 Copyright: 2004-2006, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/elasticity/cpp/Elasticity.ufl
+Files: demo/undocumented/elasticity/cpp/Elasticity.ufl
 	dolfin/la/PETScKrylovSolver.cpp
 	dolfin/la/PETScUserPreconditioner.cpp
 	dolfin/la/PETScUserPreconditioner.h
 Copyright: 2005, Johan Jansson <johanjan at math.chalmers.se>
 License: LGPL-2.1
 
-Files: demo/pde/equality/cpp/Poisson.ufl
-	demo/pde/stokes/stabilized/cpp/Stokes.ufl
-	demo/pde/stokes/taylor-hood/cpp/Stokes.ufl
-	demo/pde/sym-dirichlet-bc/cpp/Poisson.ufl
+Files: demo/undocumented/equality/cpp/Poisson.ufl
+	demo/undocumented/stokes-stabilized/cpp/Stokes.ufl
+	demo/undocumented/stokes-taylor-hood/cpp/Stokes.ufl
+	demo/undocumented/sym-dirichlet-bc/cpp/Poisson.ufl
 Copyright: 2005-2007, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -1199,6 +1194,20 @@
 Copyright: 2007, Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
 
+Files: dolfin/fem/SparsityPatternBuilder.cpp
+	dolfin/la/KrylovSolver.h
+	dolfin/la/SparsityPattern.cpp
+	dolfin/la/SparsityPattern.h
+Copyright: 2007-2009, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: demo/undocumented/dg-advection-diffusion/python/demo.py
+	site-packages/dolfin/fem/form.py
+	site-packages/dolfin/function/functionspace.py
+	test/unit/la/python/test.py
+Copyright: 2008, Johan Hake <hake at simula.no>
+License: LGPL-2.1
+
 Files: dolfin/graph/ParMETIS.cpp
 	dolfin/graph/ParMETIS.h
 	dolfin/mesh/MeshPartitioning.cpp
@@ -1206,16 +1215,23 @@
 Copyright: 2008-2009, Niclas Jansson, Ola Skavhaug <skavhaug at simula.no> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/fem/simple/cpp/main.cpp
+Files: data/meshes/dolfin-2.xml.gz
+	demo/undocumented/stokes-mini/python/dolfin-2.xml.gz
+	demo/undocumented/stokes-stabilized/cpp/dolfin-2.xml.gz
+	demo/undocumented/stokes-stabilized/python/dolfin-2.xml.gz
+Copyright: ]1vI*SOU)OHf+S)O}xS//@OKy_[nsR_b?
+License: UNKNOWN
+
+Files: demo/undocumented/conditional/cpp/Conditional.ufl
+	demo/undocumented/conditional/cpp/main.cpp
+	demo/undocumented/spatial-coordinates/cpp/SpatialCoordinates.ufl
+Copyright: 2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>@gmail.com)
+License: GPL-3+
+
+Files: demo/undocumented/simple/cpp/main.cpp
 	dolfin/io/PythonFile.cpp
 	dolfin/io/PythonFile.h
 Copyright: 2003-2005, Johan Hoffman <hoffman at csc.kth.se> and Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/io/MatlabFile.h
-	dolfin/io/OctaveFile.cpp
-	dolfin/io/OctaveFile.h
-Copyright: 2003-2006, Johan Hoffman <hoffman at csc.kth.se> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
 Files: dolfin/log/LogManager.h
@@ -1248,6 +1264,12 @@
 Copyright: 2006-2009, Johan Hake <hake at simula.no>
 License: LGPL-2.1
 
+Files: demo/pde/cahn-hilliard/cpp/CahnHilliard2D.ufl
+	demo/pde/cahn-hilliard/cpp/CahnHilliard3D.ufl
+	dolfin/la/UmfpackLUSolver.h
+Copyright: 2006-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
 Files: dolfin/main/MPI.cpp
 	dolfin/main/MPI.h
 	test/unit/io/cpp/test.cpp
@@ -1266,9 +1288,9 @@
 Copyright: 2008, Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
 
-Files: demo/adaptivity/adaptive-poisson/python/demo.py
-	demo/ode/lorenz/python/demo.py
-	demo/ode/lorenz/python/plot.py
+Files: demo/undocumented/adaptive-poisson/python/demo.py
+	demo/undocumented/lorenz/python/demo.py
+	demo/undocumented/lorenz/python/plot.py
 Copyright: 2008, Rolv Erlend Bredesen <rolv at simula.no>
 License: LGPL-2.1
 
@@ -1278,15 +1300,15 @@
 Copyright: 2008-2009, Anders Logg <logg at simula.no> and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/mesh/built-in/cpp/main.cpp
-	demo/pde/dg/biharmonic/cpp/main.cpp
-	demo/pde/dg/biharmonic/python/demo.py
+Files: demo/pde/biharmonic/cpp/main.cpp
+	demo/pde/biharmonic/python/demo.py
+	demo/undocumented/built-in/cpp/main.cpp
 Copyright: 2009, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
 License: LGPL-2.1
 
-Files: demo/pde/elastodynamics/cpp/DG0_eps_xx.ufl
-	demo/pde/elastodynamics/cpp/ElastoDynamics.ufl
-	demo/pde/elastodynamics/cpp/main.cpp
+Files: demo/undocumented/elastodynamics/cpp/DG0_eps_xx.ufl
+	demo/undocumented/elastodynamics/cpp/ElastoDynamics.ufl
+	demo/undocumented/elastodynamics/cpp/main.cpp
 Copyright: 2009, Mirko Maraldi and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
@@ -1296,35 +1318,30 @@
 Copyright: 2009, Ola Skavhaug <skavhaug at simula.no> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
+Files: demo/undocumented/spatial-coordinates/cpp/main.cpp
+	demo/undocumented/spatial-coordinates/python/demo.py
+	dolfin/swig/documentation.py
+Copyright: 2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+License: LGPL-2.1
+
 Files: bench/function/extrapolation/python/bench
-	demo/pde/neumann-poisson/cpp/main.cpp
-	demo/pde/neumann-poisson/python/demo.py
+	demo/undocumented/neumann-poisson/cpp/main.cpp
+	demo/undocumented/neumann-poisson/python/demo.py
 Copyright: 2010, Marie E. Rognes
 License: LGPL-2.1
-
-Files: data/meshes/dolfin-2.xml.gz
-	demo/pde/advection-diffusion/mesh.xml.gz
-	demo/pde/lift-drag/mesh.xml.gz
-Copyright: ]1vI*SOU)OHf+S)O}xS//@OKy_[nsR_b?
-License: UNKNOWN
-
-Files: debian/cdbs/1/class/scons-vars.mk
-	debian/cdbs/1/class/scons.mk
-Copyright: 2005, Matthew A. Nicholson <matt at matt-land.com>
-License: GPL
 
 Files: site-packages/dolfin/adaptivity/adaptive.py
 	site-packages/dolfin/adaptivity/utils.py
 Copyright: 2009-2010, Marie E. Rognes
 License: GPL-3+
 
-Files: demo/adaptivity/pde/mixed-poisson.py
-	demo/adaptivity/pde/navier-stokes.py
+Files: demo/undocumented/adaptive-pde/mixed-poisson.py
+	demo/undocumented/adaptive-pde/navier-stokes.py
 Copyright: 2010, Marie Rognes <meg at math.uio.no>
 License: GPL-3+
 
 Files: README
-	demo/pde/dielectric/python/demo.py
+	demo/undocumented/dielectric/python/demo.py
 Copyright: *No copyright*
 License: LGPL-2.1
 
@@ -1338,8 +1355,8 @@
 Copyright: 2003-2010, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: misc/utils/matlab/xmlmatrix.m
-	misc/utils/matlab/xmlvector.m
+Files: utils/matlab/xmlmatrix.m
+	utils/matlab/xmlvector.m
 Copyright: 2004, Georgios Foufas
 License: LGPL-2.1
 
@@ -1368,7 +1385,7 @@
 Copyright: 2005-2010, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/mesh/meshfunction/cpp/main.cpp
+Files: demo/undocumented/meshfunction/cpp/main.cpp
 	dolfin/io/XMLLocalMeshData.h
 Copyright: 2006, Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
@@ -1398,6 +1415,11 @@
 Copyright: 2007-2010, Anders Logg <logg at simula.no> and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
+Files: dolfin/la/KrylovSolver.cpp
+	dolfin/la/LUSolver.h
+Copyright: 2007-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
 Files: dolfin/fem/DofMapBuilder.cpp
 	dolfin/fem/DofMapBuilder.h
 Copyright: 2008, Anders Logg <logg at simula.no> and Ola Skavhaug <skavhaug at simula.no>
@@ -1408,8 +1430,8 @@
 Copyright: 2008, Dag Lindbo <dag at csc.kth.se> and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/pde/waveguide/cpp/main.cpp
-	demo/pde/waveguide/python/demo.py
+Files: demo/undocumented/waveguide/cpp/main.cpp
+	demo/undocumented/waveguide/python/demo.py
 Copyright: 2008, Evan Lezar <elezar at sun.ac.za>
 License: LGPL-2.1
 
@@ -1418,22 +1440,22 @@
 Copyright: 2008, Johan Jansson <johanjan at math.chalmers.se>
 License: LGPL-2.1
 
-Files: demo/pde/dg/advection-diffusion/cpp/Projection.ufl
+Files: demo/undocumented/dg-advection-diffusion/cpp/Projection.ufl
 	dolfin/mesh/UnitInterval.cpp
 Copyright: 2008, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
 License: LGPL-2.1
 
-Files: demo/mesh/intersection/meshintersection/2D/cpp/main.cpp
-	demo/mesh/intersection/meshintersection/2D/python/demo.py
+Files: demo/undocumented/meshintersection/2D/cpp/main.cpp
+	demo/undocumented/meshintersection/2D/python/demo.py
 Copyright: 2008, Kristoffer Selim <selim at simula.no>
 License: LGPL-2.1
 
-Files: demo/mesh/partitioning/cpp/main.cpp
-	demo/mesh/partitioning/python/demo.py
+Files: demo/undocumented/partitioning/cpp/main.cpp
+	demo/undocumented/partitioning/python/demo.py
 Copyright: 2008, Ola Skavhaug <skavhaug at simula.no> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/mesh/ale/python/demo.py
+Files: demo/undocumented/ale/python/demo.py
 	dolfin/ale/ALEType.h
 Copyright: 2008, Solveig Bruvoll <solveio at ifi.uio.no> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
@@ -1468,13 +1490,18 @@
 Copyright: 2008-2010, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
+Files: dolfin/la/EpetraLUSolver.cpp
+	dolfin/la/EpetraLUSolver.h
+Copyright: 2008-2010, Kent-Andre Mardal <kent-and at simula.no> and Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
 Files: dolfin/ode/StabilityAnalysis.cpp
 	dolfin/ode/StabilityAnalysis.h
 Copyright: 2009, Benjamin Kehlet <benjamik at student.matnat.uio.no>
 License: LGPL-2.1
 
-Files: demo/parameters/cpp/main.cpp
-	demo/parameters/python/demo.py
+Files: demo/undocumented/parameters/cpp/main.cpp
+	demo/undocumented/parameters/python/demo.py
 Copyright: 2009, Johan Hake <hake at simula.no> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -1483,25 +1510,20 @@
 Copyright: 2010, Andr Massing
 License: LGPL-2.1
 
-Files: demo/pde/spatial-coordinates/cpp/main.cpp
-	demo/pde/spatial-coordinates/python/demo.py
-Copyright: 2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
-License: LGPL-2.1
-
-Files: demo/mesh/intersection/entityintersection/cpp/main.cpp
+Files: demo/undocumented/entityintersection/cpp/main.cpp
 	dolfin/mesh/Triangle_3_Tetrahedron_3_do_intersect_SCK.cpp
 Copyright: Massing (am), massing at simula.no
 	2010-02-10 Andr Massing
 	Massing, 2010
 License: LGPL-2.1
 
-Files: demo/pde/waveguide/cpp/Forms.py
-	demo/pde/waveguide/cpp/Forms.ufl
+Files: demo/undocumented/waveguide/cpp/Forms.py
+	demo/undocumented/waveguide/cpp/Forms.ufl
 Copyright: 2008, Evan Lezar <elezar at sun.ac.za>
 License: UNKNOWN
 
-Files: demo/la/trilinos/python/demo.py
-	demo/la/trilinos/python/demo2.py
+Files: demo/undocumented/trilinos/python/demo.py
+	demo/undocumented/trilinos/python/demo2.py
 Copyright: 2008, Kent-Andre Mardal <kent-and at simula.no>
 License: UNKNOWN
 
@@ -1511,20 +1533,6 @@
 	1991, 1999, Free Software Foundation, Inc
 License: UNKNOWN
 
-Files: scons/simula-scons/simula_scons/ExtendedEnvironment.py
-Copyright: HOLDERS AND CONTRIBUTORS
-	2006, Richard Levitte <richard at levitte.org>
-License: BSD (2 clause)
-
-Files: scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/hypre/hypre-configure
-Copyright: 2006, The Regents of the University of California
-	2003, Free Software Foundation, Inc
-License: GPL (GENERATED FILE)
-
-Files: scons/simula-scons/simula_scons/pkgconfiggenerators/install_packages/hypre/hypre-struct_overlap_innerprod.c
-Copyright: 2006, The Regents of the University of California
-License: GPL
-
 Files: debian/cdbs/1/rules/copyright-check.mk
 Copyright: \s*(\S.*?)\s*\
 License: GPL
@@ -1549,13 +1557,13 @@
 Copyright: 2008-2009, Martin Sandve Alnes <martinal at simula.no>
 License: GPL-3+
 
-Files: demo/pde/simple/cpp/ReactionDiffusion.ufl
+Files: demo/undocumented/reaction-diffusion/cpp/ReactionDiffusion.ufl
 Copyright: 2009, Anders Logg <logg at simula.no>
 License: GPL-3+
 
-Files: demo/pde/spatial-coordinates/cpp/SpatialCoordinates.ufl
-Copyright: 2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>@gmail.com)
-License: GPL-3+
+Files: demo/undocumented/conditional/python/demo.py
+Copyright: 2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
+License: GPL-3.0
 
 Files: dolfin/mesh/predicates_init.h
 Copyright: *No copyright*
@@ -1573,16 +1581,12 @@
 Copyright: 2007-2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1 (GENERATED FILE)
 
-Files: demo/pde/tensor-weighted-poisson/python/demo.py
+Files: demo/undocumented/tensor-weighted-poisson/python/demo.py
 Copyright: 2009, Anders Logg <logg at simula.no>
 License: LGPL-2.1 (GENERATED FILE)
 
-Files: misc/utils/xml/inp2xml
-Copyright: 2002, Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: misc/utils/matlab/writegid.m
-Copyright: 2002, by
+Files: dolfin/la/LUSolver.cpp
+Copyright: 20010 Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: dolfin/io/XMLVector.cpp
@@ -1593,7 +1597,7 @@
 Copyright: 2002-2006, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/ode/harmonic/cpp/main.cpp
+Files: demo/undocumented/harmonic/cpp/main.cpp
 Copyright: 2002-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -1601,12 +1605,12 @@
 Copyright: 2002-2009, Johan Hoffman <hoffman at csc.kth.se> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: misc/utils/matlab/plotslab.m
+Files: utils/matlab/plotslab.m
 Copyright: 2003, Johan Hoffman <hoffman at csc.kth.se> and Anders Logg <logg at simula.no>
 	2003-2005, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/ode/stiff/cpp/TestProblem8.h
+Files: demo/undocumented/stiff/cpp/TestProblem8.h
 Copyright: 2003-2005, Johan Jansson <johanjan at math.chalmers.se>
 License: LGPL-2.1
 
@@ -1618,16 +1622,16 @@
 Copyright: 2003-2008, Anders Logg <logg at simula.no> and Jim Tilander <jt at dd.chalmers.se>
 License: LGPL-2.1
 
+Files: dolfin/io/GenericFile.h
+Copyright: 2003-2008, Johan Hoffman <hoffman at csc.kth.se> and Anders Logg <logg at simula.no>
+License: LGPL-2.1
+
 Files: dolfin/log/log.h
 Copyright: 2003-2009, Anders Logg <logg at simula.no> and Jim Tilander <jt at dd.chalmers.se>
 License: LGPL-2.1
 
-Files: misc/utils/matlab/xmlmesh.m
+Files: utils/matlab/xmlmesh.m
 Copyright: 2004, Erik Svensson <eriksv at math.chalmers.se>
-License: LGPL-2.1
-
-Files: misc/utils/gid/dolfin.bas
-Copyright: 2004, Harald Svensson <harald.s at home.se>
 License: LGPL-2.1
 
 Files: doc/manual/chapters/contributing-dolfin.tex
@@ -1646,7 +1650,7 @@
 Copyright: 2004-2007, Johan Hoffman <hoffman at csc.kth.se>, Johan Jansson <johanjan at math.chalmers.se> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/ode/stiff/cpp/TestProblem2.h
+Files: demo/undocumented/stiff/cpp/TestProblem2.h
 Copyright: 2004-2008, Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -1666,8 +1670,12 @@
 Copyright: 2004-2009, Ola Skavhaug <skavhaug at simula.no> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/nonlinear-poisson/cpp/NonlinearPoisson.ufl
+Files: demo/undocumented/nonlinear-poisson/cpp/NonlinearPoisson.ufl
 Copyright: 2005, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: dolfin/la/PETScKrylovMatrix.cpp
+Copyright: 2005-2006, Anders Logg <logg at simula.no> and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: dolfin/swig/dolfin.i
@@ -1678,20 +1686,20 @@
 Copyright: 2005-2006, Ola Skavhaug <skavhaug at simula.no>
 License: LGPL-2.1
 
-Files: misc/utils/vim/macros
+Files: dolfin/la/PETScKrylovMatrix.h
+Copyright: 2005-2010, Anders Logg <logg at simula.no> and Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: utils/vim/macros
 Copyright: 2006, :r !echo $USER ~$a.kJo// Licensed under the GNU LGPL Version 2.1.//// First added: :r !date +'\%F'kJo// Last changed: :r !date +'\%F'kJo#ifndef __FOO_H#define __FOO_H #include <dolfin/constants.h> namespace dolfin{ /// Documentation of class Foo class Foo{public: /// ConstructorFoo(); /// Destructor~Foo(); private: }; } #endif:%s/Foo/\=@a/g :%s/FOO/\=@b/g
 	2006, :r !echo $USER ~$a.kJo// Licensed under the GNU LGPL Version 2.1.//// First added: :r !date +'\%F'kJo// Last changed: :r !date +'\%F'kJo#include <dolfin/Foo.h> using namespace dolfin; //-----------------------------------------------------------------------------Foo::Foo(){// Do nothing}//-----------------------------------------------------------------------------Foo::~Foo(){// Do nothing}//-----------------------------------------------------------------------------:%s/Foo/\=@2/g
 License: LGPL-2.1
 
-Files: demo/pde/mixed-poisson/cpp/MixedPoisson.ufl
-Copyright: 2006-2007, Anders Logg <logg at simula.no> and Marie Rognes <meg at math.uio.no>
-License: LGPL-2.1
-
-Files: demo/pde/nonlinear-poisson/cpp/main.cpp
+Files: demo/undocumented/nonlinear-poisson/cpp/main.cpp
 Copyright: 2006-2007, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/pde/dg/poisson/cpp/Poisson.ufl
+Files: demo/undocumented/dg-poisson/cpp/Poisson.ufl
 Copyright: 2006-2007, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -1699,27 +1707,19 @@
 Copyright: 2006-2008, Anders Logg <logg at simula.no> and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/pde/dg/poisson/cpp/main.cpp
+Files: demo/undocumented/dg-poisson/cpp/main.cpp
 Copyright: 2006-2008, Anders Logg <logg at simula.no> and Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>
 License: LGPL-2.1
 
-Files: demo/pde/elasticity/cpp/main.cpp
+Files: demo/undocumented/elasticity/cpp/main.cpp
 Copyright: 2006-2009, Johan Jansson <johanjan at math.chalmers.se> and Anders Logg <logg at simula.no>
-License: LGPL-2.1
-
-Files: dolfin/la/UmfpackLUSolver.h
-Copyright: 2006-2010, Garth N. Wells <gnw20 at cam.ac.uk>
-License: LGPL-2.1
-
-Files: demo/pde/mixed-poisson/cpp/main.cpp
-Copyright: 2007, Anders Logg <logg at simula.no> and Marie Rognes <meg at math.uio.no>
 License: LGPL-2.1
 
 Files: test/unit/la/cpp/test.cpp
 Copyright: 2007, Johan Hake <hake at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/dg/advection-diffusion/cpp/AdvectionDiffusion.ufl
+Files: demo/undocumented/dg-advection-diffusion/cpp/AdvectionDiffusion.ufl
 Copyright: 2007, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl> and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
@@ -1731,7 +1731,7 @@
 Copyright: 2007-2008, Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/pde/dg/advection-diffusion/cpp/main.cpp
+Files: demo/undocumented/dg-advection-diffusion/cpp/main.cpp
 Copyright: 2007-2008, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>, Anders Logg <logg at simula.no> and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
@@ -1743,11 +1743,15 @@
 Copyright: 2007-2009, Anders logg
 License: LGPL-2.1
 
-Files: demo/la/eigensolver/cpp/main.cpp
+Files: demo/pde/mixed-poisson/cpp/main.cpp
+Copyright: 2007-2010, Anders Logg <logg at simula.no> and Marie Rognes <meg at math.uio.no>
+License: LGPL-2.1
+
+Files: demo/la/eigenvalue/cpp/main.cpp
 Copyright: 2007-2010, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl> and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
-Files: demo/fem/assembly/cpp/main.cpp
+Files: demo/undocumented/assembly/cpp/main.cpp
 Copyright: 2008, Anders Logg <logg at simula.no> and Gustav Magnus Vikstrom <gustavv at ifi.uio.no>
 License: LGPL-2.1
 
@@ -1767,8 +1771,8 @@
 Copyright: 2008-2010, Dag Lindbo <dag at csc.kth.se>, Anders Logg <logg at simula.no>, Ilmar Wilbers <ilmarw at simula.no>
 License: LGPL-2.1
 
-Files: dolfin/la/EpetraLUSolver.cpp
-Copyright: 2008-2010, Kent-Andre Mardal <kent-and at simula.no> and Garth N. Wells <gnw20 at cam.ac.uk>
+Files: demo/pde/hyperelasticity/python/demo.py
+Copyright: 2008-2010, Johan Hake <hake at simula.no> and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: site-packages/dolfin/common/donothing.py
@@ -1779,10 +1783,6 @@
 Copyright: 2009, Garth N. Wellls
 License: LGPL-2.1
 
-Files: demo/pde/hyperelasticity/cpp/HyperElasticity.ufl
-Copyright: 2009, Harish Narayanan
-License: LGPL-2.1
-
 Files: demo/pde/hyperelasticity/cpp/main.cpp
 Copyright: 2009, Harish Narayanyan
 License: LGPL-2.1
@@ -1795,7 +1795,7 @@
 Copyright: 2009, Johannes Ring <johannr at simula.no>
 License: LGPL-2.1
 
-Files: demo/pde/dg/biharmonic/cpp/Biharmonic.ufl
+Files: demo/pde/biharmonic/cpp/Biharmonic.ufl
 Copyright: 2009, Kristian B. Oelgaard <k.b.oelgaard at tudelft.nl>, Garth N. Wells <gnw20 at cam.ac.uk> and Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
@@ -1809,6 +1809,10 @@
 
 Files: dolfin/common/Array.h
 Copyright: 2009-2010, Garth N. Wells <gnw20 at cam.ac.uk>
+License: LGPL-2.1
+
+Files: demo/pde/hyperelasticity/cpp/HyperElasticity.ufl
+Copyright: 2009-2010, Harish Narayanan and Garth N. Wells <gnw20 at cam.ac.uk>
 License: LGPL-2.1
 
 Files: dolfin/fem/GenericDofMap.h
@@ -1840,7 +1844,7 @@
 Copyright: 22010 Anders Logg <logg at simula.no>
 License: LGPL-2.1
 
-Files: demo/ode/courtemanche/cpp/main.cpp
+Files: demo/undocumented/courtemanche/cpp/main.cpp
 Copyright: Glenn Terje Lines <glennli at simula.no>, Ola Skavhaug <skavhaug at simula.no> and Simula Research Laboratory
 License: LGPL-2.1
 
@@ -1856,7 +1860,7 @@
 	Massing, 2010
 License: LGPL-2.1
 
-Files: demo/mesh/intersection/distancequeries/cpp/main.cpp
+Files: demo/undocumented/distancequeries/cpp/main.cpp
 Copyright: Massing (am), massing at simula.no
 	2010-03-03 Andr Massing
 	Massing, 2010
@@ -1868,11 +1872,6 @@
 	2010, Andr Massing
 License: LGPL-2.1
 
-Files: scons/simula-scons/LICENSE
-Copyright: HOLDERS BE
-	2007-2008, Aasmund Oedegaard <aasmund at simula.no> and Simula Research Laboratory
-License: MIT/X11 (BSD like)
-
 Files: data/meshes/unstruct-trimesh-2.xml.gz
 Copyright: $k+/|u/NBc#yw:>b+92K<wDj(xrnCbM+udh)+hds3o/Ze6qm>M.h?|}B
 License: UNKNOWN
@@ -1886,7 +1885,7 @@
 	notices...'
 License: UNKNOWN
 
-Files: demo/pde/dg/advection-diffusion/velocity.xml.gz
+Files: demo/undocumented/dg-advection-diffusion/velocity.xml.gz
 Copyright: /k,RB^JKy)!/cRB^ZB^ZB^ZB^JK7!/-!/%RB^J+r|9tRB^JKy%B!9}RA^*+rTA^*K!/%k,nB^*Ky /}RA^*KKKy /%tRA^*KyiyT
 	K\ZB.ri\ZB.-!KWN%RB.cQZB.%riKK\ZB.-!KKtEitr)!r)!r%BNW8
 	/%T
@@ -1896,8 +1895,8 @@
 Copyright: 1jnY*d0wYk0K,T?Ra-{jHKE3-fT?2ak([*kR1Zqk>r89w|tW^rx,{zebal1/M{x|(P
 License: UNKNOWN
 
-Files: scons/simula-scons/simula_scons/pkgconfiggenerators/dolfin.py
-Copyright: 2006, Simula Research Laboratory
+Files: cmake/modules/FindGMP.cmake
+Copyright: 2006, Laurent Montel, <montel at kde.org>
 License: UNKNOWN
 
 Files: data/meshes/circle.xml.gz
@@ -1905,10 +1904,6 @@
 	K2l
 License: UNKNOWN
 
-Files: data/meshes/lshape.xml.gz
-Copyright: 35LJ~HC#n*nQ4@)w /XP=Cv7^|P>hfTF'4yPC)+XSYQYeYn8{JjiqB at ue
-License: UNKNOWN
-
 Files: data/meshes/snake_hole.xml.gz
 Copyright: 5`CR
 	M at J2J?.Xe@
@@ -1916,10 +1911,6 @@
 
 Files: data/meshes/two_particles.xml.gz
 Copyright: 5rTa;{#~~F7d|,YGdQ-+xr9|f~uf3OMH6/c3lfc^+wB~OYHh(-C/8tgvSc;?[qb/F2_ye1
-License: UNKNOWN
-
-Files: scons/simula-scons/simula_scons/pkgconfiggenerators/commonPkgConfigUtils.py
-Copyright: C (2006) Simula Research Laboratory
 License: UNKNOWN
 
 Files: data/meshes/tetmesh_bluff_body_32_8_8.xml.gz
@@ -1941,7 +1932,7 @@
 Copyright: eP,v8KKTpri.,*#Hd!gN~E1eLl_LbI
 License: UNKNOWN
 
-Files: demo/pde/tensor-weighted-poisson/python/c01.xml.gz
+Files: demo/undocumented/tensor-weighted-poisson/python/c01.xml.gz
 Copyright: eVuWAlGo at ys7\-Z1[$-.H)s UvGtsqAxciAxsaAtdK{ezsAAx <7RBuAxsAt|u|+uytiT9+QVKeae%H>^?s?_^~_~$~~;~Mwo_rr/B^DN4_QX# _QX3 9^o}a}{~/+zDH{C~m,rF2z8+V*18t\xwRxCE7,Pu
 License: UNKNOWN
 
@@ -1961,7 +1952,7 @@
 Copyright: q,NM
 License: UNKNOWN
 
-Files: demo/pde/tensor-weighted-poisson/python/mesh.xml.gz
+Files: demo/undocumented/tensor-weighted-poisson/python/mesh.xml.gz
 Copyright: qJCj8%NdAjBAZ{r 5!HA1SqJCjm5dBxNI&t[L3H;y''H\PI&tP~I&)t:D9uL3R:tPr g<tWA2!NHA&dBIZ_MS8#j}59dBxNGjq;8#wqBxdBxNdBPA&dBPA&L3Rjt:qBSntt dBPB&L3
 License: UNKNOWN
 

Added: packages/fenics/dolfin/trunk/debian/dolfin-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/dolfin-doc.install?rev=36889&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/dolfin-doc.install (added)
+++ packages/fenics/dolfin/trunk/debian/dolfin-doc.install Mon Sep 13 09:57:55 2010
@@ -1,0 +1,2 @@
+usr/share/dolfin/data
+usr/share/dolfin/demo

Modified: packages/fenics/dolfin/trunk/debian/libdolfin0-dev.install
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/libdolfin0-dev.install?rev=36889&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/libdolfin0-dev.install (original)
+++ packages/fenics/dolfin/trunk/debian/libdolfin0-dev.install Mon Sep 13 09:57:55 2010
@@ -2,3 +2,4 @@
 usr/include/dolfin
 usr/include/dolfin.h
 usr/lib/pkgconfig/dolfin.pc
+usr/share/dolfin/cmake/dolfin-config.cmake

Added: packages/fenics/dolfin/trunk/debian/patches/cmake_find_petsc_slepc.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/cmake_find_petsc_slepc.patch?rev=36889&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/cmake_find_petsc_slepc.patch (added)
+++ packages/fenics/dolfin/trunk/debian/patches/cmake_find_petsc_slepc.patch Mon Sep 13 09:57:55 2010
@@ -1,0 +1,192 @@
+--- /dev/null
++++ dolfin-0.9.9/cmake/modules/ResolveCompilerPaths.cmake
+@@ -0,0 +1,93 @@
++# ResolveCompilerPaths - this module defines two macros
++#
++# RESOLVE_LIBRARIES (XXX_LIBRARIES LINK_LINE)
++#  This macro is intended to be used by FindXXX.cmake modules.
++#  It parses a compiler link line and resolves all libraries
++#  (-lfoo) using the library path contexts (-L/path) in scope.
++#  The result in XXX_LIBRARIES is the list of fully resolved libs.
++#  Example:
++#
++#    RESOLVE_LIBRARIES (FOO_LIBRARIES "-L/A -la -L/B -lb -lc -ld")
++#
++#  will be resolved to
++#
++#    FOO_LIBRARIES:STRING="/A/liba.so;/B/libb.so;/A/libc.so;/usr/lib/libd.so"
++#
++#  if the filesystem looks like
++#
++#    /A:       liba.so         libc.so
++#    /B:       liba.so libb.so
++#    /usr/lib: liba.so libb.so libc.so libd.so
++#
++#  and /usr/lib is a system directory.
++#
++#  Note: If RESOLVE_LIBRARIES() resolves a link line differently from
++#  the native linker, there is a bug in this macro (please report it).
++#
++# RESOLVE_INCLUDES (XXX_INCLUDES INCLUDE_LINE)
++#  This macro is intended to be used by FindXXX.cmake modules.
++#  It parses a compile line and resolves all includes
++#  (-I/path/to/include) to a list of directories.  Other flags are ignored.
++#  Example:
++#
++#    RESOLVE_INCLUDES (FOO_INCLUDES "-I/A -DBAR='\"irrelevant -I/string here\"' -I/B")
++#
++#  will be resolved to
++#
++#    FOO_INCLUDES:STRING="/A;/B"
++#
++#  assuming both directories exist.
++#  Note: as currently implemented, the -I/string will be picked up mistakenly (cry, cry)
++
++macro (RESOLVE_LIBRARIES LIBS LINK_LINE)
++  string (REGEX MATCHALL "((-L|-l|-Wl)([^\" ]+|\"[^\"]+\")|/[^\" ]+(a|so|dll))" _all_tokens "${LINK_LINE}")
++  set (_libs_found)
++  set (_directory_list)
++  foreach (token ${_all_tokens})
++    if (token MATCHES "-L([^\" ]+|\"[^\"]+\")")
++      # If it's a library path, add it to the list
++      string (REGEX REPLACE "^-L" "" token ${token})
++      string (REGEX REPLACE "//" "/" token ${token})
++      list (APPEND _directory_list ${token})
++    elseif (token MATCHES "^(-l([^\" ]+|\"[^\"]+\")|/[^\" ]+(a|so|dll))")
++      # It's a library, resolve the path by looking in the list and then (by default) in system directories
++      string (REGEX REPLACE "^-l" "" token ${token})
++      set (_root)
++      if (token MATCHES "^/")	# We have an absolute path, add root to the search path
++	set (_root "/")
++      endif (token MATCHES "^/")
++      set (_lib "NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
++      find_library (_lib ${token} HINTS ${_directory_list} ${_root})
++      if (_lib)
++	string (REPLACE "//" "/" _lib ${_lib})
++        list (APPEND _libs_found ${_lib})
++      else (_lib)
++        message (STATUS "Unable to find library ${token}")
++      endif (_lib)
++    endif (token MATCHES "-L([^\" ]+|\"[^\"]+\")")
++  endforeach (token)
++  set (_lib "NOTFOUND" CACHE INTERNAL "Scratch variable" FORCE)
++  # only the LAST occurence of each library is required since there should be no circular dependencies
++  if (_libs_found)
++    list (REVERSE _libs_found)
++    list (REMOVE_DUPLICATES _libs_found)
++    list (REVERSE _libs_found)
++  endif (_libs_found)
++  set (${LIBS} "${_libs_found}")
++endmacro (RESOLVE_LIBRARIES)
++
++macro (RESOLVE_INCLUDES INCS COMPILE_LINE)
++  string (REGEX MATCHALL "-I([^\" ]+|\"[^\"]+\")" _all_tokens "${COMPILE_LINE}")
++  set (_incs_found)
++  foreach (token ${_all_tokens})
++    string (REGEX REPLACE "^-I" "" token ${token})
++    string (REGEX REPLACE "//" "/" token ${token})
++    if (EXISTS ${token})
++      list (APPEND _incs_found ${token})
++    else (EXISTS ${token})
++      message (STATUS "Include directory ${token} does not exist")
++    endif (EXISTS ${token})
++  endforeach (token)
++  list (REMOVE_DUPLICATES _incs_found)
++  set (${INCS} "${_incs_found}")
++endmacro (RESOLVE_INCLUDES)
+--- dolfin-0.9.9.orig/cmake/modules/FindSLEPc.cmake
++++ dolfin-0.9.9/cmake/modules/FindSLEPc.cmake
+@@ -71,26 +71,29 @@ show :
+   endmacro()
+ 
+   # Call macro to get the SLEPc variables
+-  slepc_get_variable(SLEPC_INCLUDE_DIRS     SLEPC_INCLUDE)
+-  slepc_get_variable(SLEPC_OTHER_LIBRARIES  OTHERSHAREDLIBS)
+-  slepc_get_variable(SLEPC_LIB_DIR          SLEPC_LIB_DIR)
++  slepc_get_variable(SLEPC_INCLUDE SLEPC_INCLUDE)
++  slepc_get_variable(SLEPC_LIB SLEPC_LIB)
++
++  # Remove some gruff in output from make
++  if ("${SLEPC_INCLUDE}" MATCHES "make.*: Entering directory")
++    string(REGEX REPLACE "make.*: Entering directory .*'(.*)make.*: Leaving directory .*" "\\1" SLEPC_INCLUDE "${SLEPC_INCLUDE}")
++  endif()
++  if ("${SLEPC_LIB}" MATCHES "make.*: Entering directory")
++    string(REGEX REPLACE "make.*: Entering directory .*'(.*)make.*: Leaving directory .*" "\\1" SLEPC_LIB "${SLEPC_LIB}")
++  endif()
+ 
+   # Remove temporary Makefile
+   file(REMOVE ${slepc_config_makefile})
+ 
+-  # Find the SLEPc library
+-  find_library(SLEPC_LIBRARY
+-    NAMES slepc
+-    HINTS ${SLEPC_LIB_DIR}
+-    )
+-
+-  # FIXME: Get full paths for 'other' libraries
+-  # Set SLEPc libraries
+-  set(SLEPC_LIBRARIES ${SLEPC_LIBRARY} ${SLEPC_OTHER_LIBRARIES})
+-
+-  # Turn SLEPC_INCLUDE_DIRS into a semi-colon separated list
+-  string(REPLACE "-I" "" SLEPC_INCLUDE_DIRS ${SLEPC_INCLUDE_DIRS})
+-  separate_arguments(SLEPC_INCLUDE_DIRS)
++  # Extract include paths and libraries from compile command line
++  include(ResolveCompilerPaths)
++  resolve_includes(SLEPC_INCLUDE_DIRS "${SLEPC_INCLUDE}")
++  resolve_libraries(SLEPC_LIBRARIES "${SLEPC_LIB}")
++
++  # Add variables to CMake cache and mark as advanced
++  set(SLEPC_INCLUDE_DIRS ${SLEPC_INCLUDE_DIRS} CACHE STRING "SLEPc include paths." FORCE)
++  set(SLEPC_LIBRARIES ${SLEPC_LIBRARIES} CACHE STRING "SLEPc libraries." FORCE)
++  mark_as_advanced(SLEPC_INCLUDE_DIRS SLEPC_LIBRARIES)
+ 
+   # Set flags for building test program
+   set(CMAKE_REQUIRED_INCLUDES ${SLEPC_INCLUDE_DIRS} ${PETSC_INCLUDE_DIRS})
+--- dolfin-0.9.9.orig/cmake/modules/FindPETSc.cmake
++++ dolfin-0.9.9/cmake/modules/FindPETSc.cmake
+@@ -110,15 +110,29 @@ show :
+   endmacro()
+ 
+   # Call macro to get the PETSc variables
+-  petsc_get_variable(PETSC_INCLUDE_DIRS PETSC_INCLUDE)
+-  petsc_get_variable(PETSC_LIBRARIES    PETSC_LIB)
++  petsc_get_variable(PETSC_INCLUDE PETSC_INCLUDE)
++  petsc_get_variable(PETSC_LIB PETSC_LIB)
++
++  # Remove some gruff in output from make
++  if ("${PETSC_INCLUDE}" MATCHES "make.*: Entering directory")
++    string(REGEX REPLACE "make.*: Entering directory .*'(.*)make.*: Leaving directory .*" "\\1" PETSC_INCLUDE "${PETSC_INCLUDE}")
++  endif()
++  if ("${PETSC_LIB}" MATCHES "make.*: Entering directory")
++    string(REGEX REPLACE "make.*: Entering directory .*'(.*)make.*: Leaving directory .*" "\\1" PETSC_LIB "${PETSC_LIB}")
++  endif()
+ 
+   # Remove temporary Makefile
+   file(REMOVE ${petsc_config_makefile})
+ 
+-  # Turn PETSC_INCLUDE_DIRS into a semi-colon separated list
+-  string(REPLACE "-I" "" PETSC_INCLUDE_DIRS ${PETSC_INCLUDE_DIRS})
+-  separate_arguments(PETSC_INCLUDE_DIRS)
++  # Extract include paths and libraries from compile command line
++  include(ResolveCompilerPaths)
++  resolve_includes(PETSC_INCLUDE_DIRS "${PETSC_INCLUDE}")
++  resolve_libraries(PETSC_LIBRARIES "${PETSC_LIB}")
++
++  # Add variables to CMake cache and mark as advanced
++  set(PETSC_INCLUDE_DIRS ${PETSC_INCLUDE_DIRS} CACHE STRING "PETSc include paths." FORCE)
++  set(PETSC_LIBRARIES ${PETSC_LIBRARIES} CACHE STRING "PETSc libraries." FORCE)
++  mark_as_advanced(PETSC_INCLUDE_DIRS PETSC_LIBRARIES)
+ 
+ endif()
+ 
+@@ -145,7 +161,9 @@ int main()
+ {
+   PetscErrorCode ierr;
+   TS ts;
+-  ierr = PetscInitializeNoArguments();CHKERRQ(ierr);
++  int argc = 0;
++  char** argv = NULL;
++  ierr = PetscInitialize(&argc, &argv, PETSC_NULL, PETSC_NULL);CHKERRQ(ierr);
+   ierr = TSCreate(PETSC_COMM_WORLD,&ts);CHKERRQ(ierr);
+   ierr = TSSetFromOptions(ts);CHKERRQ(ierr);
+   ierr = TSDestroy(ts);CHKERRQ(ierr);

Added: packages/fenics/dolfin/trunk/debian/patches/cmake_find_trilinos.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/cmake_find_trilinos.patch?rev=36889&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/cmake_find_trilinos.patch (added)
+++ packages/fenics/dolfin/trunk/debian/patches/cmake_find_trilinos.patch Mon Sep 13 09:57:55 2010
@@ -1,0 +1,32 @@
+--- dolfin-0.9.9.orig/cmake/modules/FindTrilinos.cmake
++++ dolfin-0.9.9/cmake/modules/FindTrilinos.cmake
+@@ -1,15 +1,15 @@
+ # - Try to find Trilinos
+ # Once done this will define
+ #
+-#  TRILINOS_FOUND        - system has CGAL
+-#  TRILINOS_INCLUDE_DIRS - include directories for CGAL
+-#  TRILINOS_LIBRARIES    - libraries for CGAL
+-#  TRILINOS_DEFINITIONS  - compiler flags for CGAL
++#  TRILINOS_FOUND        - system has Trilinos
++#  TRILINOS_INCLUDE_DIRS - include directories for Trilinos
++#  TRILINOS_LIBRARIES    - libraries for Trilinos
++#  TRILINOS_DEFINITIONS  - compiler flags for Trilinos
+ 
+ message(STATUS "Checking for package 'Trilinos'")
+ 
+ # Find Trilinos CMake config
+-find_package(Trilinos PATHS ${UMFPACK_DIR}/include $ENV{TRILINOS_DIR}/include QUIET)
++find_package(Trilinos PATHS ${TRILINOS_DIR}/include $ENV{TRILINOS_DIR}/include QUIET)
+ 
+ if (Trilinos_FOUND)
+ 
+@@ -25,7 +25,7 @@ if (Trilinos_FOUND)
+   # Loop over Trilinos libs and get full path
+   foreach (lib ${Trilinos_LIBRARIES})
+     find_library(TRILINOS_LIB_${lib} ${lib} PATHS ${Trilinos_LIBRARY_DIRS})
+-    if (TRILINOS_LIB_${lib})
++    if (TRILINOS_LIB_${lib} AND NOT ${lib} MATCHES ".*pytrilinos")
+       set(TRILINOS_LIBRARIES ${TRILINOS_LIBRARIES} ${TRILINOS_LIB_${lib}})
+     endif()
+   endforeach()

Added: packages/fenics/dolfin/trunk/debian/patches/install.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/install.patch?rev=36889&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/install.patch (added)
+++ packages/fenics/dolfin/trunk/debian/patches/install.patch Mon Sep 13 09:57:55 2010
@@ -1,0 +1,29 @@
+--- dolfin-0.9.9.orig/CMakeLists.txt
++++ dolfin-0.9.9/CMakeLists.txt
+@@ -358,6 +358,26 @@ set(DOLFIN_MAN_DIR "share/man")
+ add_subdirectory(dolfin)
+ 
+ #------------------------------------------------------------------------------
++# Installation of DOLFIN utilities
++
++set(DOLFIN_UTILITIES
++  ${DOLFIN_SOURCE_DIR}/utils/convert/dolfin-convert
++  ${DOLFIN_SOURCE_DIR}/utils/order/dolfin-order)
++    
++install(FILES ${DOLFIN_UTILITIES}
++  DESTINATION ${DOLFIN_BIN_DIR}
++  PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ OWNER_EXECUTE GROUP_EXECUTE WORLD_EXECUTE
++  COMPONENT RuntimeExecutables)
++
++#------------------------------------------------------------------------------
++# Installation of DOLFIN manual pages
++
++install(DIRECTORY ${DOLFIN_SOURCE_DIR}/doc/man/
++  DESTINATION ${DOLFIN_MAN_DIR}
++  USE_SOURCE_PERMISSIONS
++  COMPONENT RuntimeExecutables)
++
++#------------------------------------------------------------------------------
+ # Generate and install helper file dolfin.conf
+ 
+ # FIXME: Can CMake provide the library path name variable?

Added: packages/fenics/dolfin/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/patches/series?rev=36889&op=file
==============================================================================
--- packages/fenics/dolfin/trunk/debian/patches/series (added)
+++ packages/fenics/dolfin/trunk/debian/patches/series Mon Sep 13 09:57:55 2010
@@ -1,0 +1,3 @@
+cmake_find_petsc_slepc.patch
+cmake_find_trilinos.patch
+install.patch

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=36889&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Mon Sep 13 09:57:55 2010
@@ -6,64 +6,28 @@
 endif
 
 include debian/cdbs/1/rules/copyright-check.mk
-include debian/cdbs/1/class/scons.mk
 include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/cmake.mk
 
-# Enable parallel building
-ifneq (,$(findstring parallel,$(DEB_BUILD_OPTIONS)))
-    PARALLEL_JOBS := $(shell echo $(DEB_BUILD_OPTIONS) | \
-        sed -e 's/.*parallel=\([0-9]\+\).*/\1/')
-NJOBS := -j$(PARALLEL_JOBS)
-endif
+# Allow test programs that uses OpenMPI to run
+export OMPI_MCA_plm_rsh_agent=/bin/false
 
 DEB_COMPRESS_EXCLUDE := .py .cpp .h .pdf
 DEB_INSTALL_DOCS_ALL += AUTHORS README TODO
 
-DEB_DH_INSTALL_SOURCEDIR = debian/tmp
-
-DEB_SCONS_INVOKE = `which scons` --directory="$(DEB_BUILDDIR)"
-
-DEB_SCONS_CONFIGURE_TARGET = configure
-DEB_SCONS_CONFIGURE_OPTIONS = \
-	prefix=/usr \
-	enableMpi=1 \
-	enableUmfpack=1 \
-	enableTrilinos=1 \
-	enablePetsc=1 \
-	withPetscDir=/usr/lib/petsc \
-	withPetscArch=`petscarch` \
-	enableSlepc=1 \
-	withSlepcDir=/usr/lib/slepcdir/3.0.0 \
-	enableScotch=1 \
-	enableDocs=0 \
-	enableDemos=0 \
-	enableTests=0 \
-	enablePython=1 \
-	enableParmetis=0 \
-	enableMtl4=0 \
-	enableCgal=0
-
-DEB_SCONS_BUILD_OPTIONS = $(NJOBS)
-
-DEB_SCONS_INSTALL_OPTIONS = DESTDIR=$(DEB_DESTDIR)
-
-doc_dir = $(CURDIR)/debian/dolfin-doc/usr/share/doc/dolfin-doc
+DEB_CMAKE_EXTRA_FLAGS= \
+	-D BUILD_SHARED_LIBS:BOOL=ON \
+	-D DOLFIN_ENABLE_TRILINOS:BOOL=ON \
+	-D Trilinos_DIR:PATH=/usr/include/trilinos \
+	-D DOLFIN_ENABLE_CGAL:BOOL=OFF \
+	-D DOLFIN_ENABLE_MTL4:BOOL=OFF \
+	-D DOLFIN_ENABLE_PARMETIS:BOOL=OFF \
+	-D DOLFIN_ENABLE_UNIT_TESTS:BOOL=OFF \
+	..
 
 USCAN_DESTDIR := $(CURDIR)
 
-PYVERSIONS = $(shell pyversions --requested debian/control)
-
 clean::
-	find dolfin -name "*.os" | xargs rm -f
-	find dolfin -name "*.so*" | xargs rm -f
-	find scons -name "*.pyc" | xargs rm -f
-	rm -f .sconf_temp
-	rm -f scons/.sconsign.dblite
-	rm -f scons/configure.log
-	rm -f scons/options.cache
-	rm -rf scons/pkgconfig
-	rm -f simula_scons.log
-	rm -f dolfin.conf
 	rm -f doc/manual/dolfin-user-manual.aux
 	rm -f doc/manual/dolfin-user-manual.bbl
 	rm -f doc/manual/dolfin-user-manual.blg
@@ -76,52 +40,12 @@
 	rm -f doc/manual/dolfin-user-manual.pdf
 	rm -f doc/manual/dolfin-user-manual.ps
 	rm -f doc/manual/dolfin-user-manual.toc
-	rm -rf $(addprefix install-stamp-, $(PYVERSIONS))
-
-# Re-configure, build, and install for all versions of Python
-install/python-dolfin:: $(addprefix install-stamp-, $(PYVERSIONS))
-install-stamp-%:
-	rm -f scons/pkgconfig/python*.pc
-	rm -f scons/pkgconfig/numpy*.pc
-	`which $*` $(DEB_SCONS_INVOKE) $(DEB_SCONS_CONFIGURE_TARGET) \
-	  $(DEB_SCONS_CONFIGURE_OPTIONS)
-	`which $*` $(DEB_SCONS_INVOKE) $(DEB_SCONS_BUILD_OPTIONS)
-	`which $*` $(DEB_SCONS_INVOKE) $(DEB_SCONS_INSTALL_TARGET) \
-	  $(DEB_SCONS_INSTALL_OPTIONS)
-
-# Generate pkg-config file for DOLFIN based on pkg-config files 
-# in scons/pkgconfig:
-	cd $(DEB_DESTDIR)/usr/lib/pkgconfig && \
-	for req in `grep "^Requires:" dolfin.pc | cut -d':' -f2 | tac -s ' '`; \
-	do \
-	  if [ -e $$req.pc ]; \
-	  then \
-	    sed -i "/^Libs/s|$$|`PKG_CONFIG_PATH=$$PWD pkg-config $$req --libs` |" dolfin.pc; \
-	    sed -i "/^Cflags/s|$$|`PKG_CONFIG_PATH=$$PWD pkg-config $$req --cflags` |" dolfin.pc; \
-	    sed -i "/^Requires:/s/$$req/ /g" dolfin.pc; \
-	  fi; \
-	done
-
-	touch $@
 
 install/dolfin-doc::
-	mkdir -p $(doc_dir)/demo
-	mkdir -p $(doc_dir)/data
-	cp -a demo/adaptivity $(doc_dir)/demo
-	cp -a demo/fem $(doc_dir)/demo
-	cp -a demo/function $(doc_dir)/demo
-	cp -a demo/la $(doc_dir)/demo
-	cp -a demo/mesh $(doc_dir)/demo
-	cp -a demo/ode $(doc_dir)/demo
-	cp -a demo/parameters $(doc_dir)/demo
-	cp -a demo/pde $(doc_dir)/demo
-	cp -a demo/plot $(doc_dir)/demo
-	cp -a demo/quadrature $(doc_dir)/demo
-	cp -a data/graphs $(doc_dir)/data
-	cp -a data/meshes $(doc_dir)/data
 # Generate and install the documentation pdf:
 	cd doc/manual && make final
-	cp doc/manual/dolfin-user-manual.pdf $(doc_dir)
+	dh_install -p$(cdbs_curpkg) doc/manual/dolfin-user-manual.pdf \
+	  usr/share/doc/dolfin-doc
 
 binary-install/python-dolfin::
 	dh_pycentral -p$(cdbs_curpkg)




More information about the debian-science-commits mailing list