[SCM] gmt branch, master, updated. upstream/4.5.5-47-g4990a99

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit e951850780a0a907f36dc92d8d6195fae0353795
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Nov 25 16:47:50 2013 +0100

    One more syntax fix for nested comment, in form of simple patch file.

diff --git a/debian/patches/gmt_proj.c b/debian/patches/gmt_proj.c
new file mode 100644
index 0000000..8a46032
--- /dev/null
+++ b/debian/patches/gmt_proj.c
@@ -0,0 +1,15 @@
+Index: git/src/gmt_proj.c
+===================================================================
+--- git.orig/src/gmt_proj.c	2013-11-25 15:57:08.000000000 +0100
++++ git/src/gmt_proj.c	2013-11-25 16:45:37.000000000 +0100
+@@ -1645,7 +1645,9 @@
+ 	project_info.g_outside = FALSE;
+ 
+ 	angle = M_PI - dlon;
+-	// if (cosc < project_info.g_P_inverse) { /* over the horizon, but this was susceptible to minor roundoff. */
++#if 0
++	if (cosc < project_info.g_P_inverse) { /* over the horizon, but this was susceptible to minor roundoff. */
++#endif
+ 	if ((project_info.g_P_inverse - cosc) > GMT_CONV_LIMIT) { /* over the horizon */
+ 		project_info.g_outside = TRUE;
+ 
diff --git a/debian/patches/series b/debian/patches/series
index d3742af..9cbee0e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,6 @@
 # no current patches
 gmt_io.c
+gmt_proj.c
 kfreebsd
 bashism
 eglibc-2.17.patch

-- 
Generic Mapping Tools