[SCM] step packaging branch, master, updated. debian/15.08.0-2-5-g83a6e74

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/step.git;a=commitdiff;h=83a6e74

The following commit has been merged in the master branch:
commit 83a6e7423440e1b76513c5f60925f6ca1656209b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Oct 29 19:16:37 2015 +0100

    New patch: gravitation_variance.diff
    
    Following the same logic applied in the coulomb variance, the first term
    seems to be related to the mass variance.
---
 debian/changelog                         |  1 +
 debian/patches/gravitation_variance.diff | 25 +++++++++++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 27 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 6696016..af44380 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ step (4:15.08.0-3) unstable; urgency=medium
   * Rebuild for unstable. (Closes: #803381) Thanks to Chris Lamb for reporting
     the issue.
   * New workaround patch: wa_qt5.5_qvariant_to_string.diff
+  * New patch: gravitation_variance.diff
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 29 Oct 2015 18:56:42 +0100
 
diff --git a/debian/patches/gravitation_variance.diff b/debian/patches/gravitation_variance.diff
new file mode 100644
index 0000000..f85332f
--- /dev/null
+++ b/debian/patches/gravitation_variance.diff
@@ -0,0 +1,25 @@
+Index: step/stepcore/gravitation.cc
+===================================================================
+--- step.orig/stepcore/gravitation.cc	2015-10-29 19:00:01.268311060 +0100
++++ step/stepcore/gravitation.cc	2015-10-29 19:10:10.467716230 +0100
+@@ -85,16 +85,11 @@
+                 ParticleErrors* pe1 = p1->particleErrors();
+                 ParticleErrors* pe2 = p2->particleErrors();
+                 Vector2d rV = pe2->positionVariance() + pe1->positionVariance();
++                double massVariance = gravitationForceErrors()->_gravitationConstVariance / square(_gravitationConst) +
++                                      pe1->massVariance() / square(p1->mass()) +
++                                      pe2->massVariance() / square(p2->mass());
+                 Vector2d forceV = force.array().square()* (
+-    
+-        /*  This term was disabled and needs to be discussed with upstream.
+-         *  The definition Vector2d(double) is really forbidden and brings
+-         *  an undefined behavior
+-                        Vector2d(gravitationForceErrors()->_gravitationConstVariance / square(_gravitationConst) +
+-                                 pe1->massVariance() / square(p1->mass()) +
+-                                 pe2->massVariance() / square(p2->mass())) +
+-        */
+-           
++                        Vector2d(massVariance, massVariance) +
+                         Vector2d(rV[0] * square(1/r[0] - 3*r[0]/rnorm2) + rV[1] * square(3*r[1]/rnorm2),
+                                  rV[1] * square(1/r[1] - 3*r[1]/rnorm2) + rV[0] * square(3*r[0]/rnorm2))).array();
+                 pe1->applyForceVariance(forceV);
diff --git a/debian/patches/series b/debian/patches/series
index b4b9752..955abef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 eigen3.patch
 wa_qt5.5_qvariant_to_string.diff
+gravitation_variance.diff

-- 
step packaging