[ignition-math3] 02/02: Remove patch merge upstream

[Jose Luis Rivero]

This is an automated email from the git hooks/post-receive script.

jrivero-guest pushed a commit to branch master
in repository ignition-math3.

commit ec8ce030ef5f0af0f0cc7b1acefbaf0647b26012
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date:   Mon Jan 30 16:57:22 2017 +0000

    Remove patch merge upstream
---
 debian/patches/0003_fix_collinear_boundary.patch | 30 ------------------------
 debian/patches/series                            |  1 -
 2 files changed, 31 deletions(-)

diff --git a/debian/patches/0003_fix_collinear_boundary.patch b/debian/patches/0003_fix_collinear_boundary.patch
deleted file mode 100644
index c669bab..0000000
--- a/debian/patches/0003_fix_collinear_boundary.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Mathieu Trudel-Lapierre <mathieu.trudel-lapierre at canonical.com>
-Subject: Allow for a bit more rounding when verifying collinearity
-Submitted: No
-
----
- src/Line2_TEST.cc |    4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-Index: b/src/Line2_TEST.cc
-===================================================================
---- a/src/Line2_TEST.cc
-+++ b/src/Line2_TEST.cc
-@@ -147,7 +147,7 @@ TEST(Line2Test, CollinearPoint)
- 
-   pt.Set(0, 0.00001);
-   EXPECT_FALSE(lineA.Collinear(pt));
--  EXPECT_TRUE(lineA.Collinear(pt, 1e-4));
-+  EXPECT_TRUE(lineA.Collinear(pt, 1e-3));
-   {
-     math::Line2d ptLine(pt, pt);
-     EXPECT_FALSE(lineA.Collinear(ptLine));
-@@ -159,7 +159,7 @@ TEST(Line2Test, CollinearPoint)
- 
-   pt.Set(0, -0.00001);
-   EXPECT_FALSE(lineA.Collinear(pt));
--  EXPECT_TRUE(lineA.Collinear(pt, 1e-4));
-+  EXPECT_TRUE(lineA.Collinear(pt, 1e-3));
-   {
-     math::Line2d ptLine(pt, pt);
-     EXPECT_FALSE(lineA.Collinear(ptLine));
diff --git a/debian/patches/series b/debian/patches/series
index 676476c..abc432b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 0001-c++11-unconditional.patch
 0002_use_system_gtest.patch
-0003_fix_collinear_boundary.patch
 0004_test_failures_in_non_x64_arches.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ignition-math3.git