r36416 - in /packages/fenics/dolfin/trunk/debian: changelog control rules

[johannr-guest at users.alioth.debian.org]

Author: johannr-guest
Date: Fri Apr 23 13:22:34 2010
New Revision: 36416

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36416
Log:
Build for multiple Python versions and update version dependencies.

Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    packages/fenics/dolfin/trunk/debian/control
    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=36416&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Fri Apr 23 13:22:34 2010
@@ -1,6 +1,11 @@
 dolfin (0.9.7-2) UNRELEASED; urgency=low
 
   * Package moved from pkg-scicomp to Debian Science.
+  * Enable building for multiple Python versions.
+  * debian/control:
+    - Replace python-dev with python-all-dev in Build-Depends.
+    - Update version dependencies for python-ufc, ufc, python-ffc, and
+      python-viper) (closes: #571780).
 
  -- Johannes Ring <johannr at simula.no>  Mon, 29 Mar 2010 20:42:07 +0200
 

Modified: packages/fenics/dolfin/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/control?rev=36416&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/control (original)
+++ packages/fenics/dolfin/trunk/debian/control Fri Apr 23 13:22:34 2010
@@ -3,10 +3,10 @@
 Priority: extra
 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-dev, 
+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,
  libxml2-dev, libboost-dev, libboost-serialization-dev, libsuitesparse-dev,
- python-ufc (>= 1.2.0), libscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev,
+ python-ufc (>= 1.4.0-2), libscotch-dev, libpetsc3.0.0-dev, libslepc3.0.0-dev,
  libboost-filesystem-dev, libboost-program-options-dev
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, 
  texlive-math-extra, ghostscript
@@ -53,7 +53,7 @@
 Conflicts: libdolfin
 Replaces: libdolfin
 Provides: libdolfin
-Depends: ufc (>= 1.2.0), python-ffc (>= 0.7.0), python-viper (>= 0.4.2),
+Depends: ufc (>= 1.4.0-2), python-ffc (>= 0.9.2-1), python-viper (>= 0.4.5-1),
  ${shlibs:Depends}, ${misc:Depends}
 Suggests: dolfin-doc, libdolfin0-dbg, python-pydolfin0
 Description: shared libraries for DOLFIN

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=36416&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Fri Apr 23 13:22:34 2010
@@ -19,22 +19,50 @@
 
 DEB_COMPRESS_EXCLUDE := .py .cpp .h .pdf
 DEB_INSTALL_DOCS_ALL += AUTHORS README TODO
-DEB_SCONS_OPTIONS = $(NJOBS)
 
 DEB_DH_INSTALL_SOURCEDIR = debian/tmp
 
-DEB_SCONS_BUILD_OPTIONS = configure prefix=/usr enableMpi=1 \
-	enableUmfpack=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 \
-	enableParmetis=0 enableMtl4=0 enableCgal=0
+DEB_SCONS_CONFIGURE_TARGET = configure
+DEB_SCONS_CONFIGURE_OPTIONS = \
+	prefix=/usr \
+	enableMpi=1 \
+	enableUmfpack=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 \
+	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
 
 USCAN_DESTDIR := $(CURDIR)
+
+PYVERSIONS = $(shell pyversions --requested debian/control)
+
+SCONS = `which scons`
+
+pre-build:: $(addprefix pre-build-stamp-, $(PYVERSIONS))
+pre-build-stamp-%:
+# Prepare build directories
+	mkdir build-$*
+	cp -r `ls | grep -vE '(build-|pre-build-|debian)'` build-$*
+	touch $@
+
+post-patches::
+	$(SCONS) $(DEB_SCONS_CONFIGURE_TARGET) $(DEB_SCONS_CONFIGURE_OPTIONS)
 
 clean::
 	find dolfin -name "*.os" | xargs rm -f
@@ -47,7 +75,29 @@
 	rm -rf scons/pkgconfig
 	rm -f simula_scons.log
 	rm -f dolfin.conf
-	rm -f dolfin-user-manual.{aux,bbl,blg,dvi,idx,ilg,ind,log,out,pdf,ps,toc}
+	rm -f doc/manual/dolfin-user-manual.{aux,bbl,blg,dvi,idx,ilg,ind,log,out,pdf,ps,toc}
+	-rm -rf $(addprefix build-, $(PYVERSIONS))
+	-rm -rf $(addprefix configure-stamp-, $(PYVERSIONS))
+	-rm -rf $(addprefix build-stamp-, $(PYVERSIONS))
+	-rm -rf $(addprefix install-stamp-, $(PYVERSIONS))
+	-rm -rf $(addprefix pre-build-stamp-, $(PYVERSIONS))
+
+common-configure-arch:: $(addprefix configure-stamp-, $(PYVERSIONS))
+configure-stamp-%:
+	cd build-$* && `which $*` $(SCONS) $(DEB_SCONS_CONFIGURE_TARGET) \
+	  $(DEB_SCONS_CONFIGURE_OPTIONS)
+	touch $@
+
+common-build-arch:: $(addprefix build-stamp-, $(PYVERSIONS))
+build-stamp-%:
+	cd build-$* && `which $*` $(SCONS) $(DEB_SCONS_BUILD_OPTIONS)
+	touch $@
+
+common-install-arch:: $(addprefix install-stamp-, $(PYVERSIONS))
+install-stamp-%:
+	cd build-$* && `which $*` $(SCONS) $(DEB_SCONS_INSTALL_TARGET) \
+	  $(DEB_SCONS_INSTALL_OPTIONS)
+	touch $@
 
 # Generate pkg-config file for DOLFIN based on pkg-config files 
 # in scons/pkgconfig: