[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.60.2-60-g39140b0

[Anton Gladky]

The following commit has been merged in the master branch:
commit 9fb84aa2b34df9d96c7821d90b14f62c09e38720
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue May 10 18:17:24 2011 +0200

    Hopefully fix FTBFS on most of platforms due to MPLCONFIGDIR issue

diff --git a/debian/changelog b/debian/changelog
index de5b473..9fb0642 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+yade (0.60.2-3) unstable; urgency=low
+
+  * Hopefully fix FTBFS on most of platforms due to MPLCONFIGDIR issue
+
+ -- Anton Gladky <gladky.anton at gmail.com>  Tue, 10 May 2011 09:44:37 +0200
+
 yade (0.60.2-2) unstable; urgency=low
 
   * [6ee4fb7] Remove binutils-gold (only on platforms, where it is 
diff --git a/debian/rules b/debian/rules
index d5ae85b..78a5a15 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,6 @@
 #!/usr/bin/make -f
 
+tmpDirMatplotLib = $(CURDIR)/debian/matplotlib
 export VERSION=$(shell cat VERSION)
 export _VERSION=-${VERSION}
 
@@ -22,30 +23,32 @@ clean:
 	rm -rf debian/build-* `find debian/ -name 'yade-*' -type d`
 	rm -rf doc/sphinx/_build
 	rm -rf tags
+	rm -rf ${tmpDirMatplotLib}
 	dh clean 
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_installdirs
+	mkdir -p ${tmpDirMatplotLib}
 	## files VERSION and _VERSION contain snapshot version without/with leading '-' respectively (like svn1113 and -svn1113)
 	#debug build
 	# remove the profile, if existing, to have clean config
 	rm -f scons.profile-deb
 	# the last argument specified that we only want files in lib installed -- common files (the executable) are already in the optimized package
-	NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=3 jobs=1 features=vtk,gts,opengl,qt4,openmp PREFIX=debian/yade${_VERSION}-dbg/usr variant='' optimize=0 march= debug=1 debian/yade${_VERSION}-dbg/usr/lib
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=3 jobs=1 features=vtk,gts,opengl,qt4,openmp PREFIX=debian/yade${_VERSION}-dbg/usr variant='' optimize=0 march= debug=1 debian/yade${_VERSION}-dbg/usr/lib
 	#optimized build
-	NO_SCONS_GET_RECENT= scons profile=deb PREFIX=debian/yade${_VERSION}/usr variant='' optimize=1 debug=0
-	cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=../../debian/yade${_VERSION}/usr/ ../../debian/yade${_VERSION}/usr/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=debian/yade${_VERSION}/usr variant='' optimize=1 debug=0
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=../../debian/yade${_VERSION}/usr/ ../../debian/yade${_VERSION}/usr/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
 	# generate manpages
-	YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --generate-manpage yade${_VERSION}.1
-	YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION}-batch --generate-manpage yade${_VERSION}-batch.1
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --generate-manpage yade${_VERSION}.1
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION}-batch --generate-manpage yade${_VERSION}-batch.1
 
 check: install
 	dh_testdir
 	dh_testroot
-	YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --test
-	YADE_PREFIX=debian/yade${_VERSION}-dbg/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --debug --test
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=debian/yade${_VERSION}/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --test
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=debian/yade${_VERSION}-dbg/usr debian/yade${_VERSION}/usr/bin/yade${_VERSION} --debug --test
 	#Delete all pyc files
 	find . -name '*.pyc' -print0 | xargs -0 rm
 

-- 
Yet Another Dynamic Engine. Platform for discrete element modeling.