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

[Anton Gladky]

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

    Fix patch.

diff --git a/debian/patches/fix_FTBFS_on_KFreeBSD.patch b/debian/patches/fix_FTBFS_on_KFreeBSD.patch
index 75b0dee..16c7a8c 100644
--- a/debian/patches/fix_FTBFS_on_KFreeBSD.patch
+++ b/debian/patches/fix_FTBFS_on_KFreeBSD.patch
@@ -9,7 +9,7 @@ Last-Update: 2011-10-24
  	('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'), # 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
++	('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.