r44856 - in /packages/fenics/dolfin/trunk/debian: changelog rules

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

Author: johannr-guest
Date: Mon May 21 07:44:33 2012
New Revision: 44856

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44856
Log:
Set default Python version.

Modified:
    packages/fenics/dolfin/trunk/debian/changelog
    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=44856&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/changelog (original)
+++ packages/fenics/dolfin/trunk/debian/changelog Mon May 21 07:44:33 2012
@@ -1,3 +1,10 @@
+dolfin (1.0.0-6) unstable; urgency=low
+
+  * debian/rules: Set default Python version to fix FTBFS when Python3
+    is available (closes: #672952).
+
+ -- Johannes Ring <johannr at simula.no>  Mon, 21 May 2012 09:40:38 +0200
+
 dolfin (1.0.0-5) unstable; urgency=low
 
   * Add patches to fix problems with SWIG 2.0.5 and GCC 4.7.

Modified: packages/fenics/dolfin/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/fenics/dolfin/trunk/debian/rules?rev=44856&op=diff
==============================================================================
--- packages/fenics/dolfin/trunk/debian/rules (original)
+++ packages/fenics/dolfin/trunk/debian/rules Mon May 21 07:44:33 2012
@@ -25,6 +25,8 @@
 ENABLE_MPI=ON
 endif
 
+DEFAULT_PY_VERSION = $(shell pyversions --default)
+
 DEB_CMAKE_EXTRA_FLAGS= \
 	-D BUILD_SHARED_LIBS:BOOL=ON \
 	-D CMAKE_SKIP_RPATH:BOOL=ON \
@@ -38,6 +40,9 @@
         -D DOLFIN_ENABLE_MPI:BOOL=$(ENABLE_MPI) \
 	-D PETSC_DIR:PATH=/usr/lib/petscdir/3.2 \
 	-D SLEPC_DIR:PATH=/usr/lib/slepcdir/3.2 \
+	-D PYTHON_EXECUTABLE:FILEPATH=/usr/bin/$(DEFAULT_PY_VERSION) \
+	-D PYTHON_LIBRARY:FILEPATH=/usr/lib/lib$(DEFAULT_PY_VERSION).so \
+	-D PYTHON_INCLUDE_DIR:PATH=/usr/include/$(DEFAULT_PY_VERSION) \
 	..
 
 USCAN_DESTDIR := $(CURDIR)
@@ -46,10 +51,10 @@
 
 install-stamp-%:
 	cd $(DEB_BUILDDIR) && rm CMakeCache.txt && \
-	  cmake -D PYTHON_EXECUTABLE:FILEPATH=/usr/bin/$* \
+	  cmake $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS) \
+	    -D PYTHON_EXECUTABLE:FILEPATH=/usr/bin/$* \
 	    -D PYTHON_LIBRARY:FILEPATH=/usr/lib/lib$*.so \
-	    -D PYTHON_INCLUDE_DIR:PATH=/usr/include/$* \
-	    $(DEB_CMAKE_NORMAL_ARGS) $(DEB_CMAKE_EXTRA_FLAGS)
+	    -D PYTHON_INCLUDE_DIR:PATH=/usr/include/$*
 	make -C $(DEB_BUILDDIR) install DESTDIR=$(CURDIR)/debian/tmp
 	touch $@