[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. upstream/0.60.2-67-g608c086

[Anton Gladky]

The following commit has been merged in the master branch:
commit ed48b2f4f46d6cb4674ad3d76879317910969bd8
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat May 28 22:27:05 2011 +0200

    Fix FTBFS on kFreeBSD and other platforms, where was an error during checking qglviwer (Closes: #628376)

diff --git a/debian/patches/fix_FTBFS_on_KFreeBSD.patch b/debian/patches/fix_FTBFS_on_KFreeBSD.patch
new file mode 100644
index 0000000..171d1ec
--- /dev/null
+++ b/debian/patches/fix_FTBFS_on_KFreeBSD.patch
@@ -0,0 +1,16 @@
+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
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -123,7 +123,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
+ 	('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),
diff --git a/debian/patches/series b/debian/patches/series
index 8a99a70..e31c76a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_memory_wrong_accces_after_body_erase.patch
 fix_spelling_errors.patch
 fix_force_applying_to_non_existing_body.patch
 fix_absent_syncSizesOfContainers.patch
+fix_FTBFS_on_KFreeBSD.patch

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