[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. debian/0.60-1-6-g34a265e

[Anton Gladky]

The following commit has been merged in the master branch:
commit 34a265e62d5dff4f426e8507d6dc00fd58c6cec7
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Wed Feb 2 16:32:55 2011 +0100

    1. FIX: linking problem on Natty

diff --git a/debian/patches/fix-linking-problem-on-natty b/debian/patches/fix-linking-problem-on-natty
new file mode 100644
index 0000000..4cba1ba
--- /dev/null
+++ b/debian/patches/fix-linking-problem-on-natty
@@ -0,0 +1,26 @@
+Description: Fixes the linking problem on Natty (and probably on some other systems)
+Bug: https://bugs.launchpad.net/yade/+bug/707966
+Author: Václav Šmilauer <eu at doxos.eu>, Anton Gladky <gladky.anton at gmail.com>
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -377,7 +377,7 @@
+ 			else: featureNotOK('qt4','Building with Qt4 implies the QGLViewer library installed (package libqglviewer-qt4-dev package in debian/ubuntu, libQGLViewer in RPM-based distributions)')
+ 	if 'vtk' in env['features']:
+ 		ok=conf.CheckLibWithHeader(['vtkCommon'],'vtkInstantiator.h','c++','vtkInstantiator::New();',autoadd=1)
+-		env.Append(LIBS='vtkHybrid')
++		env.Append(LIBS=['vtkHybrid','vtkFiltering','vtkRendering','vtkIO','vtkexoIIc','vtkParallel','vtkGraphics','vtkverdict','vtkImaging','vtkftgl','vtkDICOMParser','vtkmetaio','vtksqlite','vtkNetCDF'])
+ 		if not ok: featureNotOK('vtk',note="Installer can`t find vtk-library. Be sure you have it installed (usually, libvtk5-dev package). Or you might have to add VTK header directory (e.g. /usr/include/vtk-5.4) to CPPPATH.")
+ 	if 'gts' in env['features']:
+ 		env.ParseConfig('pkg-config gts --cflags --libs');
+--- a/lib/SConscript
++++ b/lib/SConscript
+@@ -14,6 +14,6 @@
+ 	env.Combine('yade-support.cpp',['base/Math.cpp']+
+ 		['factory/ClassFactory.cpp','factory/DynLibManager.cpp','multimethods/Indexable.cpp','serialization/Serializable.cpp','pyutil/gil.cpp']
+ 		# compile TesselationWrapper only if cgal is enabled
+-		+(Split('triangulation/KinematicLocalisationAnalyser.cpp triangulation/Operations.cpp triangulation/RegularTriangulation.cpp triangulation/Timer.cpp triangulation/basicVTKwritter.cpp triangulation/FlowBoundingSphere.cpp triangulation/Network.cpp triangulation/Deformation.cpp triangulation/Empilement.cpp triangulation/stdafx.cpp triangulation/Tenseur3.cpp triangulation/Tesselation.cpp triangulation/TriaxialState.cpp') if 'cgal' in env['features'] else [])),
+-	],LIBS=['dl','m']+[],CXXFLAGS=env['CXXFLAGS']+['-fPIC']
++		+(Split('triangulation/KinematicLocalisationAnalyser.cpp triangulation/Operations.cpp triangulation/RegularTriangulation.cpp triangulation/Timer.cpp triangulation/basicVTKwritter.cpp triangulation/FlowBoundingSphere.cpp triangulation/Network.cpp triangulation/Deformation.cpp triangulation/Empilement.cpp triangulation/stdafx.cpp triangulation/Tenseur3.cpp triangulation/Tesselation.cpp triangulation/TriaxialState.cpp') if 'cgal' in env['features'] else []))+(['opengl/GLUtils.cpp'] if 'opengl' in env['features'] else []),
++	],LIBS=['dl','m']+[l for l in env['LIBS'] if l!='yade-support']+(['glut','GL','GLU'] if 'opengl' in env['features'] else []),CXXFLAGS=env['CXXFLAGS']+['-fPIC']
+ )
diff --git a/debian/patches/series b/debian/patches/series
index d38d4cc..32fa308 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
+fix-linking-problem-on-natty
 add-VERSION-file

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