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

[Anton Gladky]

The following commit has been merged in the master branch:
commit d1acf0cc20fc6aad444edf7ee985db8f5b1b0a11
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue May 24 20:07:41 2011 +0200

    Prevent building docs in binary-arch mode

diff --git a/debian/rules b/debian/rules
index eb9a0d0..b67f91a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -30,15 +30,14 @@ override_dh_auto_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
-	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=${tmpInstallDbg} variant='' optimize=0 march= debug=1 ${tmpInstallDbg}/lib
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version=${VERSION} brief=0 chunkSize=2 -j1 features=vtk,gts,opengl,qt4,openmp PREFIX=${tmpInstallDbg} variant='' optimize=0 march= debug=1 ${tmpInstallDbg}/lib
 	#optimized build
-	export MPLCONFIGDIR=${tmpDirMatplotLib}; NO_SCONS_GET_RECENT= scons profile=deb PREFIX=${tmpInstall} variant='' optimize=1 debug=0
-	export MPLCONFIGDIR=${tmpDirMatplotLib}; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=${tmpInstall} ${tmpInstall}/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=${tmpInstall} variant=''  -j1 optimize=1 debug=0
 	# generate manpages
 	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} --generate-manpage yade${_VERSION}.1
 	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION}-batch --generate-manpage yade${_VERSION}-batch.1
 
-override_dh_auto_test:	
+override_dh_auto_test:
 	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} --test
 	export MPLCONFIGDIR=${tmpDirMatplotLib}; YADE_PREFIX=${tmpInstallDbg} ${tmpInstall}/bin/yade${_VERSION} --debug --test
 	#Delete all pyc files
@@ -56,3 +55,13 @@ override_dh_strip:
 override_dh_compress:
 	dh_compress --all -X.py -X.stl -X.gts -X.geo -X.mesh -X.msh -X.pdf -X.png -X.svg -X.txt -X.js -X.inv
 
+binary-indep: 
+	dh --until dh_auto_build $@
+	#Generate docs
+	export MPLCONFIGDIR=${tmpDirMatplotLib}; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=${tmpInstall} ${tmpInstall}/bin/yade${_VERSION} yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex; cd ../..;
+	dh --after dh_auto_build $@
+	
+binary-arch: 
+	dh $@
+
+binary: binary-indep binary-arch

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