yade-dev team mailing list archive

["Anton Gladky" <gladky.anton@xxxxxxxxx>]

The following commit has been merged in the master branch:
commit 19b9ce56c4017063e9b775b08c517450ed2e45b8
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Wed May 2 23:21:45 2012 +0200

    Reenable PDF-generation. (Closes: #651220)

diff --git a/debian/control b/debian/control
index 097c717..8bb5363 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,7 @@ Build-Depends: debhelper (>= 8), scons, binutils-gold [amd64 i386],
  libcgal-dev
 Build-Depends-Indep: texlive-latex-recommended, texlive-latex-extra, lmodern, 
  texlive-pictures, texlive-xetex, libjs-jquery, python-sphinx (>=1.0.6),
- python-bibtex, graphviz, dvipng, libjs-underscore
+ python-bibtex, graphviz, dvipng, libjs-underscore, tipa
 Standards-Version: 3.9.3
 
 Package: yade
diff --git a/debian/patches/disable_tex_creation.patch b/debian/patches/disable_tex_creation.patch
deleted file mode 100644
index 5e367b1..0000000
--- a/debian/patches/disable_tex_creation.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Description: sphinx gives an error, while creating PDF. Needs to be investigated. 
-Author: Anton Gladky <gladky.anton@xxxxxxxxx>
-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/get_rid_off_suffix.patch b/debian/patches/get_rid_off_suffix.patch
new file mode 100644
index 0000000..1db998c
--- /dev/null
+++ b/debian/patches/get_rid_off_suffix.patch
@@ -0,0 +1,14 @@
+Description: Delete the suffix
+Author: Anton Gladky <gladky.anton@xxxxxxxxx>
+Last-Update: 2011-10-24
+--- a/SConstruct
++++ b/SConstruct
+@@ -189,7 +189,7 @@
+ if not env.has_key('realVersion') or not env['realVersion']: env['realVersion']=yadeSCons.getRealVersion() or 'unknown' # unknown if nothing returned
+ if not env.has_key('version'): env['version']=env['realVersion']
+ 
+-env['SUFFIX']=('-'+env['version'] if len(env['version'])>0 else '')+env['variant']
++env['SUFFIX']=''
+ env['SUFFIX_DBG']=env['SUFFIX']+('' if not env['debug'] else '/dbg')
+ env['LIBDIR']='$PREFIX/lib/yade$SUFFIX_DBG'
+ print "Yade version is `%s' (%s), installed files will be suffixed with `%s'."%(env['version'],env['realVersion'],env['SUFFIX'])
diff --git a/debian/rules b/debian/rules
index 25b17e2..e1001d6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,7 +22,7 @@ override_dh_auto_configure:
 	mkdir -p $(tmpDirMatplotLib)
 	mkdir -p $(tmpInstall)
 
-override_dh_auto_build:
+override_dh_auto_build-arch:
 	# remove the profile, if existing, to have clean config
 	rm -f scons.*
 	#Output an information about available memory and CPU
@@ -49,13 +49,6 @@ override_dh_installman:
 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 $@
+override_dh_auto_build-indep: 
 	#Generate docs
-	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; cd doc/sphinx; PYTHONPATH=. YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade yadeSphinx.py;
-	dh --after dh_auto_build $@
-	
-binary-arch: 
-	dh $@
-
-binary: binary-indep binary-arch
+	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;
diff --git a/debian/yade-doc.doc-base b/debian/yade-doc.doc-base
index 09b7729..75a5f61 100644
--- a/debian/yade-doc.doc-base
+++ b/debian/yade-doc.doc-base
@@ -7,3 +7,6 @@ Section: Science/Physics
 Format: html
 Index: /usr/share/doc/yade-doc/html/index.html
 Files: /usr/share/doc/yade-doc/*.*
+
+Format: PDF
+Files: /usr/share/doc/yade-doc/Yade.pdf
diff --git a/debian/yade-doc.docs b/debian/yade-doc.docs
index e16f428..ed1379a 100644
--- a/debian/yade-doc.docs
+++ b/debian/yade-doc.docs
@@ -1 +1,2 @@
 doc/sphinx/_build/html
+doc/sphinx/_build/latex/Yade.pdf

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