[SCM] Yet Another Dynamic Engine. Platform for discrete element modeling. branch, master, updated. debian/0.60.1-1-6-g6fbb7c1

[Anton Gladky]

The following commit has been merged in the master branch:
commit 6fbb7c1cf6d14dd0b6f017c403ee720caf66e7be
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Feb 20 20:50:34 2011 +0100

    disable-vtk-temporarily

diff --git a/debian/patches/disable-vtk-temporarily b/debian/patches/disable-vtk-temporarily
deleted file mode 100644
index 5dc2429..0000000
--- a/debian/patches/disable-vtk-temporarily
+++ /dev/null
@@ -1,14 +0,0 @@
-Description: vtk-feature is disabled due to possible incompatibility with libvtk5.6-dev
-Author: Anton Gladky <gladky.anton at gmail.com>
-
---- a/SConstruct
-+++ b/SConstruct
-@@ -115,7 +115,7 @@
- 	('optimize','Turn on optimizations (-1, 0 or 1); negative value sets optimization based on debugging: not optimize with debugging and vice versa.',-1,None,int),
- 	ListVariable('exclude','Yade components that will not be built','none',names=['gui','extra','common','dem','lattice','snow']),
- 	EnumVariable('PGO','Whether to "gen"erate or "use" Profile-Guided Optimization','',['','gen','use'],{'no':'','0':'','false':''},1),
--	ListVariable('features','Optional features that are turned on','log4cxx,opengl,gts,openmp,vtk',names=['opengl','log4cxx','cgal','openmp','gts','vtk','python','gl2ps','devirt-functors','qt4','never_use_this_one']),
-+	ListVariable('features','Optional features that are turned on','log4cxx,opengl,gts,openmp',names=['opengl','log4cxx','cgal','openmp','gts','vtk','python','gl2ps','devirt-functors','qt4','never_use_this_one']),
- 	('jobs','Number of jobs to run at the same time (same as -j, but saved)',2,None,int),
- 	#('extraModules', 'Extra directories with their own SConscript files (must be in-tree) (whitespace separated)',None,None,Split),
- 	('buildPrefix','Where to create build-[version][variant] directory for intermediary files','..'),

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