Merge lp:~scarneiro/ubuntu/trusty/clhep/fix-for-double-comparison into lp:ubuntu/trusty-proposed/clhep

[Sebastian Carneiro]

[Dmitry Shachnev (mitya57)]

Utopic now has Philipp's NMU synced: https://launchpad.net/ubuntu/+source/clhep/2.1.4.1-1.1.

=== modified file 'debian/changelog'
--- debian/changelog	2013-12-14 16:33:36 +0000
+++ debian/changelog	2014-05-11 17:45:07 +0000
@@ -1,3 +1,12 @@
+clhep (2.1.4.1-1ubuntu1) trusty-proposed; urgency=medium
+
+  * Fix FTBFS because of failed test (LP: #1251844)
+    - debian/patches/fix-double-comparison.patch:
+      changes double comparison subroutine. Patch submitted in 
+      Debian by Philipp Kern <[e-mail]>.  
+
+ -- Sebastian Carneiro <[e-mail]>  Sun, 11 May 2014 13:36:25 -0300
+
 clhep (2.1.4.1-1) unstable; urgency=low
 
   * New upstream release. (Closes: #713377)

=== added file 'debian/patches/fix-double-comparison.patch'
--- debian/patches/fix-double-comparison.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/fix-double-comparison.patch	2014-05-11 17:45:07 +0000
@@ -0,0 +1,41 @@
+Description: fix double comparision in testBug58950.cc
+ The double comparision using != failed on i386 due to the way floating
+ point works. The other test cases already ship this equals function;
+ copy it and use it.
+Author: Philipp Kern <[e-mail]>
+Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=733301
+Bug-Ubuntu: https://bugs.launchpad.net/bugs/1251844
+Forwarded: not-needed
+Last-Update: 2014-05-10
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: fix-double-comparison/Random/test/testBug58950.cc
+===================================================================
+--- fix-double-comparison.orig/Random/test/testBug58950.cc	2014-05-11 14:10:45.651267655 -0300
++++ fix-double-comparison/Random/test/testBug58950.cc	2014-05-11 14:12:46.755265486 -0300
+@@ -14,6 +14,16 @@
+ #include "CLHEP/Random/Random.h"
+ #include "pretend.h"
+ 
++// Absolutely Safe Equals Without Registers Screwing Us Up
++bool equals01(const std::vector<double> &ab) {
++	return ab[1]==ab[0];
++}
++bool equals(double a, double b) {
++	std::vector<double> ab(2);
++	ab[0]=a; ab[1]=b;
++	return (equals01(ab));
++}
++
+ bool printCheck( int & i, double & r, std::ofstream & os )
+ {
+     os << i << " " << r << std::endl; 
+@@ -151,7 +161,7 @@
+     g->setTheSeeds(seeds);
+     for (int i=0; i < nNumbers; ++i) {
+         double r = g->flat();
+-        if(v[i] != r ) {
++        if(! equals(v[i], r)) {
+            ++badcount;
+            std::cerr << " rollback fails: i, v[i], r "
+                      << i << "  " << v[i] << " " << r << std::endl;

=== modified file 'debian/patches/series'
--- debian/patches/series	2013-12-14 16:33:36 +0000
+++ debian/patches/series	2014-05-11 17:45:07 +0000
@@ -2,3 +2,4 @@
 doxygen.conf
 clhep-config.patch
 tests.patch
+fix-double-comparison.patch