[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.70.0-109-g22291a8

[Anton Gladky]

The following commit has been merged in the master branch:
commit 22291a82fab4b327d9afad89e900151e4e68b560
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Fri Nov 25 20:33:02 2011 +0100

    Disable PDF-creation (does not build for the moment).

diff --git a/debian/patches/disable_tex_creation.patch b/debian/patches/disable_tex_creation.patch
new file mode 100644
index 0000000..5e367b1
--- /dev/null
+++ b/debian/patches/disable_tex_creation.patch
@@ -0,0 +1,16 @@
+Description: sphinx gives an error, while creating PDF. Needs to be investigated. 
+Author: Anton Gladky <gladky.anton at gmail.com>
+Last-Update: 2011-11-25
+
+
+--- a/doc/sphinx/yadeSphinx.py
++++ b/doc/sphinx/yadeSphinx.py
+@@ -209,7 +209,7 @@
+ global writer
+ writer=None
+ 
+-for w in ['html','latex']: #['html','latex']:
++for w in ['html']: #['html','latex']:
+ 	if 'nolatex' in sys.argv and w=='latex': continue # skip latex build if passed nolatex (used in debian packages)
+ 	writer=w
+ 	genWrapperRst()
diff --git a/debian/patches/series b/debian/patches/series
index f2ef593..604bf84 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_FTBFS_on_KFreeBSD.patch
 get_rid_off_suffix.patch
 fix_vtk-5.8_compilation.patch
 ipython-0.11-migration.patch
+disable_tex_creation.patch
diff --git a/debian/rules b/debian/rules
index edcec9f..bc9f065 100755
--- a/debian/rules
+++ b/debian/rules
@@ -52,7 +52,7 @@ override_dh_compress:
 binary-indep: 
 	dh --until dh_auto_build $@
 	#Generate docs
-	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade yadeSphinx.py; cd _build/latex; xelatex Yade.tex; xelatex Yade.tex; xelatex Yade.tex;
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade yadeSphinx.py;
 	dh --after dh_auto_build $@
 	
 binary-arch: 

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