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

[Anton Gladky]

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

    fix-memory-leak-in-InsertionSortCollider patch renamed and fixed (bzr import patch was unsuccessfull in previous commi)

diff --git a/debian/patches/fix-memory-leak-in-insertionsortcollider.patch b/debian/patches/fix-memory-leak-in-InsertionSortCollider.patch
similarity index 82%
rename from debian/patches/fix-memory-leak-in-insertionsortcollider.patch
rename to debian/patches/fix-memory-leak-in-InsertionSortCollider.patch
index 2500cbf..07faf04 100644
--- a/debian/patches/fix-memory-leak-in-insertionsortcollider.patch
+++ b/debian/patches/fix-memory-leak-in-InsertionSortCollider.patch
@@ -3,9 +3,9 @@ Author: Sergei Dorofeenko <dorofeenko at icp.ac.ru>, Václav Šmilauer <eu at doxos.eu
 Bug: https://bugs.launchpad.net/bugs/721107
 Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2565
 
-=== modified file 'pkg/common/InsertionSortCollider.cpp'
---- pkg/common/InsertionSortCollider.cpp	2010-10-13 16:23:08 +0000
-+++ pkg/common/InsertionSortCollider.cpp	2011-02-20 13:49:22 +0000
+
+--- a/pkg/common/InsertionSortCollider.cpp
++++ b/pkg/common/InsertionSortCollider.cpp
 @@ -92,7 +92,7 @@
  		// or the time of scheduled run already came, or we were never scheduled yet
  		if(!strideActive) return true;
@@ -15,10 +15,8 @@ Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2565
  		if(nBins<=0){
  			if(fastestBodyMaxDist<0){fastestBodyMaxDist=0; return true;}
  			fastestBodyMaxDist+=sqrt(newton->maxVelocitySq)*scene->dt;
-
-=== modified file 'pkg/common/VelocityBins.cpp'
---- pkg/common/VelocityBins.cpp	2010-10-13 16:23:08 +0000
-+++ pkg/common/VelocityBins.cpp	2011-02-20 13:49:22 +0000
+--- a/pkg/common/VelocityBins.cpp
++++ b/pkg/common/VelocityBins.cpp
 @@ -9,8 +9,12 @@
  #endif
  CREATE_LOGGER(VelocityBins);
@@ -33,10 +31,8 @@ Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2565
  	FOREACH(Bin& bin, bins){
  		// NOTE: this mimics the integration scheme of NewtonIntegrator
  		// if you use different integration method, it must be changed (or the infrastructure somehow modified to allow for that)
-
-=== modified file 'pkg/common/VelocityBins.hpp'
---- pkg/common/VelocityBins.hpp	2010-10-13 16:23:08 +0000
-+++ pkg/common/VelocityBins.hpp	2011-02-20 13:49:22 +0000
+--- a/pkg/common/VelocityBins.hpp
++++ b/pkg/common/VelocityBins.hpp
 @@ -23,7 +23,7 @@
  	struct Bin{
  		Bin(): binMinVelSq(-1), binMaxVelSq(-1), maxDist(0), currDist(0), currMaxVelSq(0), nBodies(0){
@@ -56,4 +52,3 @@ Applied-Upstream: http://bazaar.launchpad.net/~yade-dev/yade/0.60/revision/2565
  	
  	/* NOTE: following 3 functions are separated because of multi-threaded operation of NewtonIntegrator
  	in that case, every thread must have its own per-bin maximum and binVelSqFinalize will assign the
-
diff --git a/debian/patches/series b/debian/patches/series
index b479634..7f85512 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
+fix-memory-leak-in-InsertionSortCollider.patch
 vtkNetCDF-is-deleted-from-libs.patch
-fix-memory-leak-in-insertionsortcollider.patch

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