← Back to team overview

yade-dev team mailing list archive

[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. debian/0.70.0-5-1-g714d23e

 

The following commit has been merged in the master branch:
commit 714d23eba04575f7383fefff54901e8ef172a071
Author: Anton Gladky <gladky.anton@xxxxxxxxx>
Date:   Thu Apr 12 19:34:21 2012 +0200

    Enable cgal-feature.

diff --git a/debian/control b/debian/control
index 721b725..60471fe 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,8 @@ Build-Depends: debhelper (>= 7.0.50~), scons, binutils-gold [amd64 i386],
  python-support, libboost-serialization-dev, libloki-dev, 
  docbook-to-man, ipython, libgts-dev, python-numpy, g++(>>4.0), libvtk5-dev, 
  libgl1-mesa-dev, gdb, python-matplotlib, python-tk, libeigen3-dev, 
- libqglviewer-qt4-dev, python-xlib, python-qt4, pyqt4-dev-tools, python-imaging
+ libqglviewer-qt4-dev, python-xlib, python-qt4, pyqt4-dev-tools, python-imaging,
+ 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
diff --git a/debian/rules b/debian/rules
index bc9f065..25b17e2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,7 +29,7 @@ override_dh_auto_build:
 	-cat /proc/meminfo
 	-cat /proc/cpuinfo
 	#optimized build
-	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version='' brief=0 chunkSize=2 features=vtk,gts,opengl,qt4,openmp PREFIX=$(tmpInstall) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=1 -j1 march= debug=0 
+	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib)$ ; NO_SCONS_GET_RECENT= scons profile=deb buildPrefix=debian runtimePREFIX=/usr version='' brief=0 chunkSize=2 features=vtk,gts,opengl,qt4,openmp,cgal PREFIX=$(tmpInstall) variant='' CXXFLAGS='$(CXXFLAGS)' optimize=1 -j1 march= debug=0 
 	# generate manpages
 	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade --generate-manpage yade.1
 	export MPLCONFIGDIR=$(tmpDirMatplotLib) HOME=$(tmpDirMatplotLib) ; YADE_PREFIX=$(tmpInstall) $(tmpInstall)/bin/yade-batch --generate-manpage yade-batch.1

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