He's an improved patch that builds against the current Debian Python default version.
Adam: Python 2.6 is now the default in sid, you might as well make teh change. SR -- Stefano Rivera http://tumbleweed.org.za/ H: +27 21 465 6908 C: +27 72 419 8559 UCT: x3127
diff -Nru elmerfem-5.5.0.svn.4458.dfsg/debian/changelog
elmerfem-5.5.0.svn.4458.dfsg/debian/changelog
--- elmerfem-5.5.0.svn.4458.dfsg/debian/changelog 2010-05-05
14:44:19.000000000 +0200
+++ elmerfem-5.5.0.svn.4458.dfsg/debian/changelog 2010-06-18
19:01:58.000000000 +0200
@@ -1,3 +1,11 @@
+elmerfem (5.5.0.svn.4458.dfsg-2.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Build ElmerGUI against the current default Python version
+ (Closes: #539096)
+
+ -- Stefano Rivera <stef...@rivera.za.net> Fri, 18 Jun 2010 17:25:04 +0200
+
elmerfem (5.5.0.svn.4458.dfsg-2) unstable; urgency=low
* Make sure patches apply before building (closes: #580207).
diff -Nru elmerfem-5.5.0.svn.4458.dfsg/debian/patches/ElmerGUI-config.patch
elmerfem-5.5.0.svn.4458.dfsg/debian/patches/ElmerGUI-config.patch
--- elmerfem-5.5.0.svn.4458.dfsg/debian/patches/ElmerGUI-config.patch
2010-05-04 22:34:36.000000000 +0200
+++ elmerfem-5.5.0.svn.4458.dfsg/debian/patches/ElmerGUI-config.patch
2010-06-18 19:01:58.000000000 +0200
@@ -1,8 +1,8 @@
Have ElmerGUI use PythonQt, update VTK version, and specify OCC includes and
libs correctly.
-
---- elmerfem-5.5.0.svn.4041.dfsg/ElmerGUI/ElmerGUI.pri~ 2009-03-17
15:12:17.000000000 -0400
-+++ elmerfem-5.5.0.svn.4041.dfsg/ElmerGUI/ElmerGUI.pri 2009-03-17
15:22:37.000000000 -0400
+Build against Debian's default Python version.
+--- a/ElmerGUI/ElmerGUI.pri
++++ b/ElmerGUI/ElmerGUI.pri
@@ -11,7 +11,7 @@
DEFINES += EG_VTK # Use VTK for postprocessing?
DEFINES += EG_MATC # Use MATC for internal operations in postprocessing?
@@ -12,6 +12,18 @@
#------------------------------------------------------------------------------
# 64 bit system?
+@@ -36,9 +36,9 @@
+ # Python library:
+
#------------------------------------------------------------------------------
+ unix {
+- PY_INCLUDEPATH = /usr/include/python2.5
++ PY_INCLUDEPATH = /usr/include/$$(DEB_PY_VERSION)
+ PY_LIBPATH = /usr/lib
+- PY_LIBS = -lpython2.5
++ PY_LIBS = -l$$(DEB_PY_VERSION)
+ }
+
+ win32 {
@@ -75,7 +75,7 @@
# VTK library:
#------------------------------------------------------------------------------
diff -Nru elmerfem-5.5.0.svn.4458.dfsg/debian/rules
elmerfem-5.5.0.svn.4458.dfsg/debian/rules
--- elmerfem-5.5.0.svn.4458.dfsg/debian/rules 2010-05-05 14:42:08.000000000
+0200
+++ elmerfem-5.5.0.svn.4458.dfsg/debian/rules 2010-06-18 21:00:54.000000000
+0200
@@ -118,7 +118,13 @@
make -C $$elmermodule install DESTDIR=$(CURDIR)/debian/tmp; \
done
echo; echo BUILDING ELMER MODULE ElmerGUI; echo
- (cd ElmerGUI && ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI qmake
&& ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI make)
+ (set -e; cd ElmerGUI; \
+ export DEB_PY_VERSION=$(shell pyversions -d); \
+ export ELMER_HOME=/usr; \
+ export ELMERGUI_HOME=/usr/share/ElmerGUI; \
+ qmake; \
+ make)
+ (cd ElmerGUI && ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI
DEB_PY_VERSION=$(shell pyversions -d) qmake && ELMER_HOME=/usr
ELMERGUI_HOME=/usr/share/ElmerGUI make)
(cd ElmerGUIlogger && ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI
qmake -project && ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI qmake &&
ELMER_HOME=/usr ELMERGUI_HOME=/usr/share/ElmerGUI make)
echo; echo INSTALLING ELMER MODULE ElmerGUI; echo
make -C ElmerGUI install ELMER_HOME=/usr
ELMERGUI_HOME=/usr/share/ElmerGUI INSTALL_ROOT=$(CURDIR)/debian/tmp
signature.asc
Description: Digital signature
