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

[Anton Gladky]

The following commit has been merged in the master branch:
commit b9c8f44a0d9f734198b879c327ef10c1b9eb626b
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Nov 24 18:57:06 2011 +0100

    Fix compilation with vtk-5.8.

diff --git a/debian/patches/fix_vtk-5.8_compilation.patch b/debian/patches/fix_vtk-5.8_compilation.patch
new file mode 100644
index 0000000..7a8a13d
--- /dev/null
+++ b/debian/patches/fix_vtk-5.8_compilation.patch
@@ -0,0 +1,26 @@
+Description: fix FTBFS with vtk-5.8.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/trunk/revision/2967
+                  http://bazaar.launchpad.net/~yade-dev/yade/trunk/revision/2970
+Last-Update: 2011-11-24
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -100,7 +100,7 @@
+ 	('chunkSize','Maximum files to compile in one translation unit when building plugins. (unlimited if <= 0, per-file linkage is used if 1)',7,None,int),
+ 	('version','Yade version (if not specified, guess will be attempted)',None),
+ 	('realVersion','Revision (usually bzr revision); guessed automatically unless specified',None),
+-	('CPPPATH', 'Additional paths for the C preprocessor (colon-separated)','/usr/include/vtk-5.0:/usr/include/vtk-5.2:/usr/include/vtk-5.4:/usr/include/vtk-5.6:/usr/include/vtk:/usr/include/qt4/QtCore/:/usr/include/qt4/:/usr/include/qt4/QtXml:/usr/include/qt4/QtOpenGL:/usr/include/qt4/QtGui'), # hardy has vtk-5.0
++	('CPPPATH', 'Additional paths for the C preprocessor (colon-separated)','/usr/include/vtk-5.0:/usr/include/vtk-5.2:/usr/include/vtk-5.4:/usr/include/vtk-5.6:/usr/include/vtk-5.8:/usr/include/vtk:/usr/include/qt4/QtCore/:/usr/include/qt4/:/usr/include/qt4/QtXml:/usr/include/qt4/QtOpenGL:/usr/include/qt4/QtGui'), # hardy has vtk-5.0
+ 	('LIBPATH','Additional paths for the linker (colon-separated)',None),
+ 	('libstdcxx','Specify libstdc++ location by hand (opened dynamically at startup), usually not needed',None),
+ 	('QT4CXX','Specify a different compiler for files including qt4; this is necessary for older qt version (<=4.7) which don\'t compile with clang',None),
+@@ -355,7 +355,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','vtkFiltering','vtkRendering','vtkIO','vtkexoIIc','vtkParallel','vtkGraphics','vtkverdict','vtkImaging','vtkftgl','vtkDICOMParser','vtkmetaio','vtksqlite'])
++		env.Append(LIBS=['vtkHybrid','vtkFiltering','vtkRendering','vtkIO','vtkexoIIc','vtkParallel','vtkGraphics','vtkverdict','vtkImaging','vtkftgl','vtkDICOMParser','vtkmetaio')
+ 		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');
diff --git a/debian/patches/series b/debian/patches/series
index f2c5ff9..056b3b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 fix_FTBFS_on_KFreeBSD.patch
 get_rid_off_suffix.patch
+fix_vtk-5.8_compilation.patch

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