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

[Anton Gladky]

The following commit has been merged in the master branch:
commit 4d7707d137c97661b5c38150745e17f726e18f6e
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Jun 7 17:38:55 2011 +0200

    use eigen3 instead of eigen2

diff --git a/debian/control b/debian/control
index b6a916c..52c6df3 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends: debhelper (>= 7.0.50), scons, binutils-gold [amd64 i386], freeglu
  libboost-iostreams-dev (>=1.35), libboost-program-options-dev, python-support,
  libboost-serialization-dev, libloki-dev, liblog4cxx10-dev,
  docbook-to-man, ipython, libgts-dev, python-numpy, g++(>>4.0), libvtk5-dev, libgl1-mesa-dev,
- gdb, python-matplotlib, python-tk, libeigen2-dev, libqglviewer-qt4-dev,
+ gdb, python-matplotlib, python-tk, libeigen3-dev, libqglviewer-qt4-dev,
  texlive-latex-recommended, texlive-latex-extra, lmodern, texlive-pictures, texlive-xetex, 
  python-sphinx (>=1.0.5), python-bibtex, graphviz, dvipng, python-xlib, python-qt4,
  pyqt4-dev-tools, libjs-jquery
diff --git a/debian/patches/series b/debian/patches/series
index 8c80730..eba16fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix_force_applying_to_non_existing_body.patch
 fix_absent_syncSizesOfContainers.patch
 fix_FTBFS_on_KFreeBSD.patch
 fix_compilation_with_eigen3.patch
+use_eigen3_instead_of_eigen2.patch
diff --git a/debian/patches/fix_FTBFS_on_KFreeBSD.patch b/debian/patches/use_eigen3_instead_of_eigen2.patch
similarity index 78%
copy from debian/patches/fix_FTBFS_on_KFreeBSD.patch
copy to debian/patches/use_eigen3_instead_of_eigen2.patch
index 171d1ec..e9f0c18 100644
--- a/debian/patches/fix_FTBFS_on_KFreeBSD.patch
+++ b/debian/patches/use_eigen3_instead_of_eigen2.patch
@@ -1,7 +1,6 @@
-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.
+Description: use eigen3 instead of eigen2
 Author: Anton Gladky <gladky.anton at gmail.com>
-Bug-Debian: http://bugs.debian.org/628376
-Last-Update: 2011-05-28
+Last-Update: 2011-06-07
 
 --- a/SConstruct
 +++ b/SConstruct
@@ -9,8 +8,8 @@ Last-Update: 2011-05-28
  	('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/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/eigen3:/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.