[SCM] gmt branch, master, updated. upstream/4.5.5-47-g4990a99
The following commit has been merged in the master branch: commit 0ff5bfe2a55f7590c5932b9abf8d0d3c667c3011 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Nov 25 15:58:31 2013 +0100 Annotated new upstream release. diff --git a/debian/changelog b/debian/changelog index 14ff2f3..d9827ca 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +gmt (4.5.11-1) UNRELEASED; urgency=low + + * New upstream release for the 4.x series. + + -- Francesco Paolo Lovergine fran...@debian.org Mon, 25 Nov 2013 15:57:54 +0100 + gmt (4.5.9-1) unstable; urgency=low * Added Octave support and an ad-hoc new package for that. -- Generic Mapping Tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-47-g4990a99
The following commit has been merged in the master branch: commit eb83743c2d12a59a0d669093993ed73ae8359e6d Merge: 4ebccc453d31af2e65352ae15bc261a83b252ba8 9daab80429ffd981e3df81181c24314ff2a040f8 Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Nov 25 15:56:25 2013 +0100 Merge tag 'upstream/4.5.11' Upstream version 4.5.11 -- Generic Mapping Tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-47-g4990a99
The following commit has been merged in the master branch:
commit b088fecf0c8a6fad6edf6bf91903c77dda50da13
Author: Francesco Paolo Lovergine fran...@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 fran...@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 000..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.0 +0100
git/src/gmt_io.c 2013-11-25 16:37:51.0 +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 Tclock 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
___
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-47-g4990a99
The following commit has been merged in the master branch: commit 4990a994d1a1be964785107e7bce414ca7323f7f Author: Francesco Paolo Lovergine fran...@debian.org Date: Mon Nov 25 17:31:17 2013 +0100 Annotated changelog for new patch diff --git a/debian/changelog b/debian/changelog index 67ccac0..84687c5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,11 +1,12 @@ gmt (4.5.11-1) unstable; urgency=low * New upstream release for the 4.x series. - * Added patch gmt_io.c and gmt_proj.c to avoid nested comments use -while -pedantic mode is enabled. + * Added patch gmt_io.c, mgd77header.c and gmt_proj.c to avoid nested comments +use while -pedantic mode is enabled. * Added patch c++comments to remove C++ style comments in pure C code. This is currently deprecated and should be avoided when strict option like -pedantic are used. + * -- Francesco Paolo Lovergine fran...@debian.org Mon, 25 Nov 2013 15:57:54 +0100 -- Generic Mapping Tools ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] gmt branch, master, updated. upstream/4.5.5-47-g4990a99
The following commit has been merged in the master branch:
commit 043c829ea25b4d5903cd9acaae71aa42554a
Author: Francesco Paolo Lovergine fran...@debian.org
Date: Mon Nov 25 17:04:19 2013 +0100
Fixed for C++ comments used here and there.
New patch c++comments has been introduced.
diff --git a/debian/changelog b/debian/changelog
index 7910c12..67ccac0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
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.
+ * Added patch gmt_io.c and gmt_proj.c to avoid nested comments use
+while -pedantic mode is enabled.
+ * Added patch c++comments to remove C++ style comments in pure C code. This
+is currently deprecated and should be avoided when strict option
+like -pedantic are used.
-- Francesco Paolo Lovergine fran...@debian.org Mon, 25 Nov 2013 15:57:54
+0100
diff --git a/debian/patches/c++comments b/debian/patches/c++comments
new file mode 100644
index 000..69f6670
--- /dev/null
+++ b/debian/patches/c++comments
@@ -0,0 +1,74 @@
+Index: git/src/grdfft.c
+===
+--- git.orig/src/grdfft.c 2013-11-25 15:57:08.0 +0100
git/src/grdfft.c 2013-11-25 16:59:54.0 +0100
+@@ -1083,7 +1083,7 @@
+ sprintf (format, %s\t%s\t%s\n, gmtdefs.d_format, gmtdefs.d_format,
gmtdefs.d_format);
+ powfactor = 4.0 / pow ((double)ndatac, 2.0);
+ for (k = 0; k nk; k++) {
+- //eps_pow = 1.0/sqrt((double)nused[k]/(double)nk);
++ /* eps_pow = 1.0/sqrt((double)nused[k]/(double)nk);*/
+ eps_pow = 1.0/sqrt((double)nused[k]);
+ freq = (k + 1) * delta_k;
+ if (give_wavelength) freq = 1.0/freq;
+Index: git/src/grdimage.c
+===
+--- git.orig/src/grdimage.c2013-11-25 15:57:08.0 +0100
git/src/grdimage.c 2013-11-25 17:00:34.0 +0100
+@@ -601,15 +601,15 @@
+ struct GRD_HEADER tmp_header;
+ for (i = 0; i n_grids; i++) {
+ map[i] = tmp1[i];
+- //r_head[i].nx = g_head[i].nx; r_head[i].ny =
g_head[i].ny;
+- //r_head[i].x_inc = g_head[i].x_inc;r_head[i].y_inc
= g_head[i].y_inc;
++ /*r_head[i].nx = g_head[i].nx; r_head[i].ny =
g_head[i].ny;
++r_head[i].x_inc = g_head[i].x_inc;r_head[i].y_inc
= g_head[i].y_inc;*/
+ memcpy ((void *)tmp_header, (void *)g_head[i], sizeof
(struct GRD_HEADER));
+ r_head[i] = g_head[i];
+ GMT_set_proj_limits (r_head[i], tmp_header,
need_to_project);
+ }
+ if (Ctrl-I.active) {
+- //j_head.nx = i_head.nx;j_head.ny =
i_head.ny;
+- //j_head.x_inc = i_head.x_inc; j_head.y_inc =
i_head.y_inc;
++ /*j_head.nx = i_head.nx;j_head.ny =
i_head.ny;
++j_head.x_inc = i_head.x_inc; j_head.y_inc =
i_head.y_inc;*/
+ intensity = tmp2;
+ memcpy ((void *)tmp_header, (void *)i_head, sizeof
(struct GRD_HEADER));
+ j_head = i_head;
+Index: git/src/project.c
+===
+--- git.orig/src/project.c 2013-11-25 15:57:08.0 +0100
git/src/project.c 2013-11-25 17:01:17.0 +0100
+@@ -818,7 +818,7 @@
+ double s[3]; /* s points to the south pole */
+ double x[3]; /* tmp vector */
+ double cp;
+- // double sin_lat_to_pole;
++ /* double sin_lat_to_pole;*/
+
+ s[0] = s[1] = 0.0;
+ s[2] = -1.0;
+@@ -835,8 +835,8 @@
+ cp = GMT_dot3v (p, c);
+ if (!generate) memcpy ((void *)c, (void *)x, 3*sizeof(double));
+ if (!c_given) GMT_cart_to_geo(clat, clon, c, TRUE); /* return the
possibly adjusted center */
+- //sin_lat_to_pole = d_sqrt (1.0 - cp * cp);
+- //return (sin_lat_to_pole);
++ /*sin_lat_to_pole = d_sqrt (1.0 - cp * cp);*/
++ /*return (sin_lat_to_pole);*/
+ }
+
+ #if 0
+Index: git/src/psmask.c
+===
+--- git.orig/src/psmask.c 2013-11-25 15:57:08.0 +0100
git/src/psmask.c 2013-11-25 17:01:29.0 +0100
+@@ -701,7 +701,7 @@
+ for (j = j0; go_on j h-ny; j++) {
+ ij = GMT_IJ (j, i0, h-nx);
+ for (i = i0; go_on i h-nx-1; i++, ij++) {
+- // edge_word = (GMT_LONG)(ij / 32 +
info-offset);
++ /* edge_word = (GMT_LONG)(ij / 32 +
info-offset);*/
+
[SCM] gmt branch, master, updated. upstream/4.5.5-47-g4990a99
The following commit has been merged in the master branch: commit 90534ea2dfa136a339896fba36f9fe7c4c00b64e Author: Francesco Paolo Lovergine fran...@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 000..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.0 +0100 git/src/mgd77/mgd77header.c2013-11-25 17:19:37.0 +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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
