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

frankie at alioth.debian.org frankie at alioth.debian.org
Wed May 26 15:48:13 UTC 2010


Author: frankie
Date: 2010-05-26 15:48:09 +0000 (Wed, 26 May 2010)
New Revision: 2892

Removed:
   packages/geographiclib/trunk/debian/patches/destdir
   packages/geographiclib/trunk/debian/patches/longdouble
Modified:
   packages/geographiclib/trunk/debian/changelog
   packages/geographiclib/trunk/debian/patches/datadir
   packages/geographiclib/trunk/debian/patches/series
Log:
New release 1.2


Modified: packages/geographiclib/trunk/debian/changelog
===================================================================
--- packages/geographiclib/trunk/debian/changelog	2010-05-24 14:48:29 UTC (rev 2891)
+++ packages/geographiclib/trunk/debian/changelog	2010-05-26 15:48:09 UTC (rev 2892)
@@ -1,3 +1,10 @@
+geographiclib (1.2-1) unstable; urgency=low
+
+  * New upstream release with a couple of bugs fixed in the geodesic routines.
+    Previous patches merged: longdouble and destdir.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Wed, 26 May 2010 17:35:50 +0200
+
 geographiclib (1.1-2) unstable; urgency=low
 
   * Added longdouble patch: fixed problems with unsupported long double 

Modified: packages/geographiclib/trunk/debian/patches/datadir
===================================================================
--- packages/geographiclib/trunk/debian/patches/datadir	2010-05-24 14:48:29 UTC (rev 2891)
+++ packages/geographiclib/trunk/debian/patches/datadir	2010-05-26 15:48:09 UTC (rev 2892)
@@ -1,21 +1,21 @@
-Index: geographiclib-1.1/include/Makefile.in
+Index: geographiclib-1.2/include/Makefile.in
 ===================================================================
---- geographiclib-1.1.orig/include/Makefile.in	2010-03-11 12:59:12.000000000 +0100
-+++ geographiclib-1.1/include/Makefile.in	2010-03-11 12:59:19.000000000 +0100
-@@ -195,7 +195,7 @@
+--- geographiclib-1.2.orig/include/Makefile.in	2010-05-21 16:41:49.000000000 +0200
++++ geographiclib-1.2/include/Makefile.in	2010-05-26 17:46:40.000000000 +0200
+@@ -224,7 +224,7 @@
  				GeographicLib/TransverseMercator.hpp \
  				GeographicLib/UTMUPS.hpp
  
--geoid_dir = $(datadir)/GeographicLib/geoids
-+geoid_dir = $(datadir)/geoids
+-geoids_dir = $(datadir)/GeographicLib/geoids
++geoids_dir = $(datadir)/geoids
  EXTRA_DIST = Makefile.mk
  all: all-am
  
-Index: geographiclib-1.1/src/Makefile.in
+Index: geographiclib-1.2/src/Makefile.in
 ===================================================================
---- geographiclib-1.1.orig/src/Makefile.in	2010-03-11 13:06:51.000000000 +0100
-+++ geographiclib-1.1/src/Makefile.in	2010-03-11 13:07:06.000000000 +0100
-@@ -243,7 +243,7 @@
+--- geographiclib-1.2.orig/src/Makefile.in	2010-05-21 16:41:49.000000000 +0200
++++ geographiclib-1.2/src/Makefile.in	2010-05-26 17:45:47.000000000 +0200
+@@ -273,7 +273,7 @@
  		../include/GeographicLib/TransverseMercator.hpp \
  		../include/GeographicLib/UTMUPS.hpp
  

Deleted: packages/geographiclib/trunk/debian/patches/destdir
===================================================================
--- packages/geographiclib/trunk/debian/patches/destdir	2010-05-24 14:48:29 UTC (rev 2891)
+++ packages/geographiclib/trunk/debian/patches/destdir	2010-05-26 15:48:09 UTC (rev 2892)
@@ -1,15 +0,0 @@
-Index: geographiclib-1.1/doc/Makefile.in
-===================================================================
---- geographiclib-1.1.orig/doc/Makefile.in	2010-03-10 16:47:02.000000000 +0100
-+++ geographiclib-1.1/doc/Makefile.in	2010-03-10 16:47:21.000000000 +0100
-@@ -391,8 +391,8 @@
- 	rm -rf html
- 
- install-doc: doc
--	$(INSTALL) -d $(docdir)/html
--	$(INSTALL) -m 644 html/* $(docdir)/html
-+	$(INSTALL) -d $(DESTDIR)$(docdir)/html
-+	$(INSTALL) -m 644 html/* $(DESTDIR)$(docdir)/html
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:

Deleted: packages/geographiclib/trunk/debian/patches/longdouble
===================================================================
--- packages/geographiclib/trunk/debian/patches/longdouble	2010-05-24 14:48:29 UTC (rev 2891)
+++ packages/geographiclib/trunk/debian/patches/longdouble	2010-05-26 15:48:09 UTC (rev 2892)
@@ -1,75 +0,0 @@
-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-05-24 14:48:29 UTC (rev 2891)
+++ packages/geographiclib/trunk/debian/patches/series	2010-05-26 15:48:09 UTC (rev 2892)
@@ -1,3 +1 @@
 datadir
-destdir
-longdouble




More information about the Pkg-grass-devel mailing list