[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 f8836ed321d3b3749d6b59db340275af0f6f2810
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sun Feb 20 20:46:14 2011 +0100

    vtk-feature enabled; vtkNetCDF is deleted from vtk-libs (seems, functionality is not corrupted).

diff --git a/debian/patches/series b/debian/patches/series
index b0520d1..b479634 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-disable-vtk-temporarily
+vtkNetCDF-is-deleted-from-libs.patch
 fix-memory-leak-in-insertionsortcollider.patch
diff --git a/debian/patches/vtkNetCDF-is-deleted-from-libs.patch b/debian/patches/vtkNetCDF-is-deleted-from-libs.patch
new file mode 100644
index 0000000..d4df2c4
--- /dev/null
+++ b/debian/patches/vtkNetCDF-is-deleted-from-libs.patch
@@ -0,0 +1,15 @@
+Description: vtkNetCDF was deleted frmo libs due to absence in libvtk5.6-dev. Seems, functionality is not corrupted.
+Author: Anton Gladky <gladky.anton at gmail.com>
+Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/trunk/revision/2751
+
+--- a/SConstruct
++++ b/SConstruct
+@@ -377,7 +377,7 @@
+ 			else: featureNotOK('qt4','Building with Qt4 implies the QGLViewer library installed (package libqglviewer-qt4-dev package in debian/ubuntu, libQGLViewer in RPM-based distributions)')
+ 	if 'vtk' in env['features']:
+ 		ok=conf.CheckLibWithHeader(['vtkCommon'],'vtkInstantiator.h','c++','vtkInstantiator::New();',autoadd=1)
+-		env.Append(LIBS=['vtkHybrid','vtkFiltering','vtkRendering','vtkIO','vtkexoIIc','vtkParallel','vtkGraphics','vtkverdict','vtkImaging','vtkftgl','vtkDICOMParser','vtkmetaio','vtksqlite','vtkNetCDF'])
++		env.Append(LIBS=['vtkHybrid','vtkFiltering','vtkRendering','vtkIO','vtkexoIIc','vtkParallel','vtkGraphics','vtkverdict','vtkImaging','vtkftgl','vtkDICOMParser','vtkmetaio','vtksqlite'])
+ 		if not ok: featureNotOK('vtk',note="Installer can`t find vtk-library. Be sure you have it installed (usually, libvtk5-dev package). Or you might have to add VTK header directory (e.g. /usr/include/vtk-5.4) to CPPPATH.")
+ 	if 'gts' in env['features']:
+ 		env.ParseConfig('pkg-config gts --cflags --libs');

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