[Pkg-scicomp-commits] fenics/dolfin/trunk/debian

[Johannes Ring]

SVN commit 4708 by johannr-guest:

Add doc-base and minor fixes in debian/rules.

 M  +5 -1      fenics/dolfin/trunk/debian/changelog  
 A             fenics/dolfin/trunk/debian/dolfin-doc.doc-base  
 M  +3 -2      fenics/dolfin/trunk/debian/rules  


--- fenics/dolfin/trunk/debian/changelog #4707:4708
@@ -1,4 +1,4 @@
-dolfin (0.9.5-1) UNRELEASED; urgency=low
+dolfin (0.9.5-1) unstable; urgency=low
 
   * New upstream release. This release simplifies the use of Constants
     and Expressions in both the C++ and Python interfaces, with the
@@ -7,6 +7,10 @@
     number of small bugs have been fixed.
   * debian/watch: Update download URL.
   * debian/copyright: Update for new and removed files.
+  * debian/rules: 
+    - Include adaptivity demos in dolfin-doc package.
+    - Disable ParMETIS and MTL4 explicitly.
+  * Add debian/dolfin-doc.doc-base for DOLFIN user manual.
 
  -- Johannes Ring <johannr at simula.no>  Tue, 08 Dec 2009 13:07:47 +0100
 
--- fenics/dolfin/trunk/debian/rules #4707:4708
@@ -27,7 +27,8 @@
 	enableUmfpack=1 enableGts=1 enableTrilinos=0 enablePetsc=1 \
 	withPetscDir=/usr/lib/petscdir/3.0.0 withPetscArch=`petscarch` \
 	enableSlepc=1 withSlepcDir=/usr/lib/slepcdir/3.0.0 enableScotch=1 \
-	enableDocs=0 enableDemos=0 enableTests=0 enablePython=1
+	enableDocs=0 enableDemos=0 enableTests=0 enablePython=1 \
+	enableParmetis=0 enableMtl4=0
 
 DEB_SCONS_INSTALL_OPTIONS = DESTDIR=$(DEB_DESTDIR)
 
@@ -72,6 +73,7 @@
 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
@@ -85,7 +87,6 @@
 	cp -a data/meshes $(doc_dir)/data
 # Keep lintian happy (executable-not-elf-or-script):
 	chmod -x $(doc_dir)/demo/ode/lorenz/python/demo.py
-	chmod -x $(doc_dir)/demo/pde/adaptive-poisson/python/demo.py
 # Generate and install the documentation pdf:
 	cd doc/manual && make final
 	cp doc/manual/dolfin-user-manual.pdf $(doc_dir)