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

Francesco Paolo Lovergine frankie at debian.org
Mon Nov 25 16:43:41 UTC 2013


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

    Added a patch to fix syntax error.

diff --git a/debian/changelog b/debian/changelog
index d9827ca..7910c12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
-gmt (4.5.11-1) UNRELEASED; urgency=low
+gmt (4.5.11-1) unstable; urgency=low
 
   * New upstream release for the 4.x series.
+  * Added patch gmt_io.c to avoid nested comments use while -pedantic mode is enabled.
 
  -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 25 Nov 2013 15:57:54 +0100
 
diff --git a/debian/patches/gmt_io.c b/debian/patches/gmt_io.c
new file mode 100644
index 0000000..ab5c829
--- /dev/null
+++ b/debian/patches/gmt_io.c
@@ -0,0 +1,16 @@
+Index: git/src/gmt_io.c
+===================================================================
+--- git.orig/src/gmt_io.c	2013-11-25 15:57:08.000000000 +0100
++++ git/src/gmt_io.c	2013-11-25 16:37:51.000000000 +0100
+@@ -2772,8 +2772,9 @@
+ 
+ 		callen = strlen (s);
+ 		if (callen < 2) return (GMT_IS_NAN);	/* Maybe should be more than 2  */
+-
+-		//if ((p = strchr ( s, (int)('T'))) == NULL) {	/* This was too naive, being tricked by data like 12-OCT-20 (no trailing T, so OCT was it) */
++#if 0
++		if ((p = strchr ( s, (int)('T'))) == NULL) {	/* This was too naive, being tricked by data like 12-OCT-20 (no trailing T, so OCT was it) */
++#endif
+ 		if (s[0] == 'T') {	/* Got T<clock> presumably */
+ 			clocklen = callen - 1;
+ 			strncpy (clockstring, &s[1], (size_t)callen);
diff --git a/debian/patches/series b/debian/patches/series
index 58061fb..d3742af 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,5 @@
 # no current patches
+gmt_io.c
 kfreebsd
 bashism
 eglibc-2.17.patch

-- 
Generic Mapping Tools



More information about the Pkg-grass-devel mailing list