[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 90534ea2dfa136a339896fba36f9fe7c4c00b64e
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Nov 25 17:22:06 2013 +0100

    One more fix for nested comments.

diff --git a/debian/patches/mgd77header.c b/debian/patches/mgd77header.c
new file mode 100644
index 0000000..43b9772
--- /dev/null
+++ b/debian/patches/mgd77header.c
@@ -0,0 +1,15 @@
+Index: git/src/mgd77/mgd77header.c
+===================================================================
+--- git.orig/src/mgd77/mgd77header.c	2013-11-25 15:57:08.000000000 +0100
++++ git/src/mgd77/mgd77header.c	2013-11-25 17:19:37.000000000 +0100
+@@ -759,7 +759,9 @@
+ 	not_used = fgets (line, BUFSIZ, F->fp);		/* Skip the column header  */
+     
+ 	MGD77_header = (char *)GMT_memory (VNULL, (size_t)MGD77T_HEADER_LENGTH, sizeof (char), GMT_program);
+-	// not_used = fgets (MGD77_header, BUFSIZ, F->fp);			/* Read the entire header record  */
++#if 0
++	not_used = fgets (MGD77_header, BUFSIZ, F->fp);			/* Read the entire header record  */
++#endif
+     
+ 	for (i = 0; i < 2; i++) H->mgd77[i] = (struct MGD77_HEADER_PARAMS *) GMT_memory (VNULL, (size_t)1, sizeof (struct MGD77_HEADER_PARAMS), GMT_program);	/* Allocate parameter header */
+     
diff --git a/debian/patches/series b/debian/patches/series
index b9b9b96..97cacfd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ kfreebsd
 bashism
 eglibc-2.17.patch
 c++comments
+mgd77header.c

-- 
Generic Mapping Tools