[DebianGIS-dev] r2814 - in packages/geographiclib/trunk/debian: . patches

[frankie at alioth.debian.org]

Author: frankie
Date: 2010-04-06 10:53:58 +0000 (Tue, 06 Apr 2010)
New Revision: 2814

Added:
   packages/geographiclib/trunk/debian/patches/longdouble
Modified:
   packages/geographiclib/trunk/debian/changelog
   packages/geographiclib/trunk/debian/patches/series
Log:
Fixed FTBS.


Modified: packages/geographiclib/trunk/debian/changelog
===================================================================
--- packages/geographiclib/trunk/debian/changelog	2010-04-04 18:56:10 UTC (rev 2813)
+++ packages/geographiclib/trunk/debian/changelog	2010-04-06 10:53:58 UTC (rev 2814)
@@ -1,3 +1,11 @@
+geographiclib (1.1-2) unstable; urgency=low
+
+  * Added longdouble patch: fixed problems with unsupported long double 
+    on some archs.  Thanks Nobuhiro Iwamatsu.
+    (closes: #573930)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Tue, 06 Apr 2010 12:46:55 +0200
+
 geographiclib (1.1-1) unstable; urgency=low
 
   * Initial release.

Added: packages/geographiclib/trunk/debian/patches/longdouble
===================================================================
--- packages/geographiclib/trunk/debian/patches/longdouble	                        (rev 0)
+++ packages/geographiclib/trunk/debian/patches/longdouble	2010-04-06 10:53:58 UTC (rev 2814)
@@ -0,0 +1,75 @@
+Index: geographiclib-1.1/include/GeographicLib/Constants.hpp
+===================================================================
+--- geographiclib-1.1.orig/include/GeographicLib/Constants.hpp	2010-04-06 12:50:15.000000000 +0200
++++ geographiclib-1.1/include/GeographicLib/Constants.hpp	2010-04-06 12:51:47.000000000 +0200
+@@ -111,9 +111,11 @@
+     { return ::hypot(x, y); }
+     static inline float hypot(float x, float y) throw()
+     { return ::hypotf(x, y); }
++#ifndef __NO_LONG_DOUBLE_MATH
+     static inline long double hypot(long double x, long double y) throw()
+     { return ::hypotl(x, y); }
+ #endif
++#endif
+ 
+ #if defined(DOXYGEN) || defined(_MSC_VER)
+     /**
+@@ -134,9 +136,11 @@
+ #else
+     static inline double expm1(double x) throw() { return ::expm1(x); }
+     static inline float expm1(float x) throw() { return ::expm1f(x); }
++#ifndef __NO_LONG_DOUBLE_MATH
+     static inline long double expm1(long double x) throw()
+     { return ::expm1l(x); }
+ #endif
++#endif
+ 
+ #if defined(DOXYGEN) || defined(_MSC_VER)
+     /**
+@@ -160,9 +164,11 @@
+ #else
+     static inline double log1p(double x) throw() { return ::log1p(x); }
+     static inline float log1p(float x) throw() { return ::log1pf(x); }
++#ifndef __NO_LONG_DOUBLE_MATH
+     static inline long double log1p(long double x) throw()
+     { return ::log1pl(x); }
+ #endif
++#endif
+ 
+ #if defined(DOXYGEN) || defined(_MSC_VER)
+     /**
+@@ -178,9 +184,11 @@
+ #else
+     static inline double asinh(double x) throw() { return ::asinh(x); }
+     static inline float asinh(float x) throw() { return ::asinhf(x); }
++#ifndef __NO_LONG_DOUBLE_MATH
+     static inline long double asinh(long double x) throw()
+     { return ::asinhl(x); }
+ #endif
++#endif
+ 
+ #if defined(DOXYGEN) || defined(_MSC_VER)
+     /**
+@@ -196,9 +204,11 @@
+ #else
+     static inline double atanh(double x) throw() { return ::atanh(x); }
+     static inline float atanh(float x) throw() { return ::atanhf(x); }
++#ifndef __NO_LONG_DOUBLE_MATH
+     static inline long double atanh(long double x) throw()
+     { return ::atanhl(x); }
+ #endif
++#endif
+ 
+ #if defined(DOXYGEN) || defined(_MSC_VER)
+     /**
+@@ -211,8 +221,10 @@
+ #else
+     static inline double cbrt(double x) throw() { return ::cbrt(x); }
+     static inline float cbrt(float x) throw() { return ::cbrtf(x); }
++#ifndef __NO_LONG_DOUBLE_MATH
+     static inline long double cbrt(long double x) throw() { return ::cbrtl(x); }
+ #endif
++#endif
+ 
+ #if defined(DOXYGEN)
+     /**

Modified: packages/geographiclib/trunk/debian/patches/series
===================================================================
--- packages/geographiclib/trunk/debian/patches/series	2010-04-04 18:56:10 UTC (rev 2813)
+++ packages/geographiclib/trunk/debian/patches/series	2010-04-06 10:53:58 UTC (rev 2814)
@@ -1,2 +1,3 @@
 datadir
 destdir
+longdouble