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

[Johannes Ring]

SVN commit 4150 by johannr-guest:

Updates for DOLFIN release 0.9.1.

 M  +1 -1      fenics/dolfin/trunk/debian/changelog  
 M  +1 -1      fenics/dolfin/trunk/debian/control  
 M  +2 -5      fenics/dolfin/trunk/debian/rules  


--- fenics/dolfin/trunk/debian/changelog #4149:4150
@@ -1,4 +1,4 @@
-dolfin (0.9.0-1) unstable; urgency=low
+dolfin (0.9.1-1) unstable; urgency=low
 
   * Initial release (Closes: #503082)
 
--- fenics/dolfin/trunk/debian/control #4149:4150
@@ -69,7 +69,7 @@
 XB-Python-Version: ${python:Versions}
 Conflicts: python-dolfin
 Replaces: python-dolfin
-Depends: libdolfin0 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: libdolfin0-dev (= ${binary:Version}), libdolfin0 (= ${binary:Version}), ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Provides: ${python:Provides}
 Suggests: dolfin-doc
 Description: C++/Python library for solving differential equations
--- fenics/dolfin/trunk/debian/rules #4149:4150
@@ -5,12 +5,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-VERSION=0.8.1
 MAJOR=0
 
 SCONS=`which scons`
 
-CXXFLAGS=-Wall -pipe -ansi
+export CXXFLAGS=-Wall -pipe -ansi
 
 # Python-versions on the build system, we also force 2.5 just to be sure.
 PYVERS=$(sort $(shell pyversions -vr) 2.5)
@@ -31,8 +30,6 @@
 	  enableTrilinos=0 \
 	  enableSlepc=0 \
 	  enableScotch=1 \
-	  withScotchDir=/usr \
-	  enableData=0 \
 	  enableDocs=0 \
 	  enableDemos=0 \
 	  enableTests=0 \
@@ -87,7 +84,7 @@
 
 	# Python file is treated specially
 	mkdir -p debian/python-pydolfin$(MAJOR)/usr/lib/python$*/site-packages/
-	cp -r debian/tmp/lib/python$*/site-packages/dolfin \
+	cp -r debian/tmp/lib/python$*/site-packages/* \
 	  debian/python-pydolfin$(MAJOR)/usr/lib/python$*/site-packages/
 
 	dh_install -s