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

Anton Gladky gladky.anton at gmail.com
Mon Oct 24 20:36:04 UTC 2011


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

    Delete unneded patch (eigen2-eigen3).

diff --git a/debian/patches/series b/debian/patches/series
index 182eb42..f2c5ff9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 fix_FTBFS_on_KFreeBSD.patch
-use_eigen3_instead_of_eigen2.patch
 get_rid_off_suffix.patch
diff --git a/debian/patches/use_eigen3_instead_of_eigen2.patch b/debian/patches/use_eigen3_instead_of_eigen2.patch
deleted file mode 100644
index e9f0c18..0000000
--- a/debian/patches/use_eigen3_instead_of_eigen2.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: use eigen3 instead of eigen2
-Author: Anton Gladky <gladky.anton at gmail.com>
-Last-Update: 2011-06-07
-
---- 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:/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.



More information about the debian-science-commits mailing list