[SCM] geographiclib branch, master, updated. upstream/1.8-12-g249758d

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit dafa3fbf8e250b59304f5839811ac2e1f0458181
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Fri Mar 9 20:10:45 2012 +0100

    New upstream release.

diff --git a/debian/changelog b/debian/changelog
index f66b852..691dddf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+geographiclib (1.18-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Fri, 09 Mar 2012 19:50:01 +0100
+
 geographiclib (1.8-2) unstable; urgency=low
 
   * Fixed typo in changelog to make lintian happy.
diff --git a/debian/patches/datadir b/debian/patches/datadir
index ae21529..96c6e65 100644
--- a/debian/patches/datadir
+++ b/debian/patches/datadir
@@ -1,26 +1,26 @@
-Index: geographiclib-1.2/include/Makefile.in
+Index: geographiclib/include/Makefile.in
 ===================================================================
---- 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
+--- geographiclib.orig/include/Makefile.in	2012-03-09 19:49:48.000000000 +0100
++++ geographiclib/include/Makefile.in	2012-03-09 20:00:37.000000000 +0100
+@@ -246,7 +246,7 @@
+ 			GeographicLib/Utility.hpp \
+ 			GeographicLib/Config.h
  
 -geoids_dir = $(datadir)/GeographicLib/geoids
 +geoids_dir = $(datadir)/geoids
- EXTRA_DIST = Makefile.mk
+ EXTRA_DIST = Makefile.mk GeographicLib/CMakeLists.txt GeographicLib/Config.h.in
  all: all-am
  
-Index: geographiclib-1.2/src/Makefile.in
+Index: geographiclib/src/Makefile.in
 ===================================================================
---- 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
+--- geographiclib.orig/src/Makefile.in	2012-03-09 19:49:49.000000000 +0100
++++ geographiclib/src/Makefile.in	2012-03-09 19:59:13.000000000 +0100
+@@ -312,7 +312,7 @@
+ 		../include/GeographicLib/Utility.hpp \
+ 		../include/GeographicLib/Config.h
  
--geoids_dir = $(datadir)/GeographicLib/geoids
-+geoids_dir = $(datadir)/geoids
- EXTRA_DIST = Makefile.mk
+-geographiclib_data = $(datadir)/GeographicLib
++geographiclib_data = $(datadir)
+ EXTRA_DIST = Makefile.mk CMakeLists.txt Geographic.pro
  all: all-am
  

-- 
A library to solve some geodesic problems