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

[Anton Gladky]

The following commit has been merged in the master branch:
commit ae3d1aecdf848b4794c41eabff00da8cc4e3668e
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Oct 24 22:44:49 2011 +0200

    Update patch (fix KFreeBSD compilation).

diff --git a/debian/patches/fix_FTBFS_on_KFreeBSD.patch b/debian/patches/fix_FTBFS_on_KFreeBSD.patch
index 171d1ec..75b0dee 100644
--- a/debian/patches/fix_FTBFS_on_KFreeBSD.patch
+++ b/debian/patches/fix_FTBFS_on_KFreeBSD.patch
@@ -1,16 +1,15 @@
 Description: fix FTBFS on KFreeBSD and hopefully on other platforms, where was a problem with compiling qglviewer. Adding additional pathes for finding necessary header-files.
 Author: Anton Gladky <gladky.anton at gmail.com>
 Bug-Debian: http://bugs.debian.org/628376
-Last-Update: 2011-05-28
-
+Last-Update: 2011-10-24
 --- a/SConstruct
 +++ b/SConstruct
-@@ -123,7 +123,7 @@
+@@ -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/eigen2:/usr/include/vtk'), # 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/eigen2:/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'), # 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':/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),

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