[gmt] 05/08: Refresh patches.
Bas Couwenberg
sebastic at debian.org
Tue May 9 08:04:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository gmt.
commit 9be44f8444a948e147a10832568acc959d2d43ac
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Tue May 9 07:52:15 2017 +0200
Refresh patches.
---
debian/changelog | 1 +
debian/patches/disable-triangle.patch | 8 ++++----
debian/patches/manpage-section.patch | 6 +++++-
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fd97f07..c0c61f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gmt (5.4.0+dfsg-1) UNRELEASED; urgency=medium
* New upstream release.
* Add libcurl4-gnutls-dev | libcurl-ssl-dev to build dependencies.
+ * Refresh patches.
-- Bas Couwenberg <sebastic at debian.org> Tue, 09 May 2017 07:41:11 +0200
diff --git a/debian/patches/disable-triangle.patch b/debian/patches/disable-triangle.patch
index c4fac4a..e6b5fea 100644
--- a/debian/patches/disable-triangle.patch
+++ b/debian/patches/disable-triangle.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
-@@ -231,15 +231,15 @@ if (DO_API_TESTS)
+@@ -237,15 +237,15 @@ if (DO_API_TESTS)
set (GMT_DEMOS_SRCS testapi.c testpsl.c testgmt5.c testgmtio.c testgrdio.c testio.c testapiconv.c example1.c testapi_matrix.c testapi_vector.c test_JL.c test_walter.c)
endif (DO_API_TESTS)
@@ -27,16 +27,16 @@ Forwarded: not-needed
# Note: Developers can set EXTRA_MODULES in ConfigUser.cmake to test new modules
set (GMT_PROGS_SRCS blockmean.c blockmedian.c blockmode.c filter1d.c
-@@ -276,7 +276,7 @@ set (GMT_LIB_SRCS block_subs.h common_by
+@@ -285,7 +285,7 @@ set (GMT_LIB_SRCS block_subs.h common_by
gmt_plot.h gmt_project.h gmt_prototypes.h gmt_psl.h gmt_shore.h
- gmt_symbol.h gmt_synopsis.h gmt_texture.h gmt_time.h
+ gmt_symbol.h gmt_synopsis.h gmt_texture.h gmt_time.h gmt_cpt_masters.h
gmt_types.h gmt_unique.h gmt_version.h gshhg_version.h postscriptlight.h
- s_rint.h triangle.h gmt.h gmt_resources.h gmt_private.h
+ s_rint.h gmt.h gmt_resources.h gmt_private.h
gmt_error_codes.h gmt_api.c gmt_bcr.c gmt_calclock.c gmt_cdf.c gmt_compat.c
gmt_customio.c gmt_dcw.c gmt_error.c gmt_fft.c gmt_grdio.c gmt_io.c
gmt_memory.c gmt_nc.c gmt_notposix.c gmt_proj.c gmt_shore.c gmt_sph.c
-@@ -378,11 +378,6 @@ configure_file (gmt-config.in gmt-config
+@@ -388,11 +388,6 @@ configure_file (gmt-config.in gmt-config
# gmtprogram
set (GMT_PROGRAM ${GMT_SOURCE_DIR}/src/gmtprogram.c)
diff --git a/debian/patches/manpage-section.patch b/debian/patches/manpage-section.patch
index b844321..e272798 100644
--- a/debian/patches/manpage-section.patch
+++ b/debian/patches/manpage-section.patch
@@ -5,7 +5,7 @@ Forwarded: not-needed
--- a/doc/rst/conf.py.in
+++ b/doc/rst/conf.py.in
-@@ -232,141 +232,141 @@ latex_elements = {
+@@ -232,143 +232,143 @@ latex_elements = {
# One entry per manual page. List of tuples
# (source start file, name, description, authors, manual section).
man_pages = [
@@ -82,6 +82,7 @@ Forwarded: not-needed
-('psmask', 'psmask', 'Use data tables to clip or mask map areas with no coverage', '', 1),
-('psrose', 'psrose', 'Plot a polar histogram (rose, sector, windrose diagrams)', '', 1),
-('psscale', 'psscale', 'Plot a gray or color scale-bar on maps', '', 1),
+-('psternary', 'psternary', 'Plot data on ternary diagrams', '', 1),
-('pstext', 'pstext', 'Plot or typeset text on maps', '', 1),
-('pswiggle', 'pswiggle', 'Plot z = f(x,y) anomalies along tracks', '', 1),
-('psxy', 'psxy', 'Plot lines, polygons, and symbols on maps', '', 1),
@@ -105,6 +106,7 @@ Forwarded: not-needed
-('supplements/meca/pspolar', 'pspolar', 'Plot polarities on the inferior focal half-sphere on maps', '', 1),
-('supplements/meca/psvelo', 'psvelo', 'Plot velocity vectors, crosses, and wedges on maps', '', 1),
-('supplements/mgd77/mgd77convert', 'mgd77convert', 'Convert MGD77 data to other file formats', '', 1),
+-('supplements/mgd77/mgd77header', 'mgd77header', 'Create MGD77 headers from A77 files', '', 1),
-('supplements/mgd77/mgd77info', 'mgd77info', 'Extract information about MGD77 files', '', 1),
-('supplements/mgd77/mgd77list', 'mgd77list', 'Extract data from MGD77 files', '', 1),
-('supplements/mgd77/mgd77magref', 'mgd77magref', 'Evaluate the IGRF or CM4 magnetic field models', '', 1),
@@ -217,6 +219,7 @@ Forwarded: not-needed
+('psmask', 'psmask', 'Use data tables to clip or mask map areas with no coverage', '', '1gmt'),
+('psrose', 'psrose', 'Plot a polar histogram (rose, sector, windrose diagrams)', '', '1gmt'),
+('psscale', 'psscale', 'Plot a gray or color scale-bar on maps', '', '1gmt'),
++('psternary', 'psternary', 'Plot data on ternary diagrams', '', '1gmt'),
+('pstext', 'pstext', 'Plot or typeset text on maps', '', '1gmt'),
+('pswiggle', 'pswiggle', 'Plot z = f(x,y) anomalies along tracks', '', '1gmt'),
+('psxy', 'psxy', 'Plot lines, polygons, and symbols on maps', '', '1gmt'),
@@ -240,6 +243,7 @@ Forwarded: not-needed
+('supplements/meca/pspolar', 'pspolar', 'Plot polarities on the inferior focal half-sphere on maps', '', '1gmt'),
+('supplements/meca/psvelo', 'psvelo', 'Plot velocity vectors, crosses, and wedges on maps', '', '1gmt'),
+('supplements/mgd77/mgd77convert', 'mgd77convert', 'Convert MGD77 data to other file formats', '', '1gmt'),
++('supplements/mgd77/mgd77header', 'mgd77header', 'Create MGD77 headers from A77 files', '', '1gmt'),
+('supplements/mgd77/mgd77info', 'mgd77info', 'Extract information about MGD77 files', '', '1gmt'),
+('supplements/mgd77/mgd77list', 'mgd77list', 'Extract data from MGD77 files', '', '1gmt'),
+('supplements/mgd77/mgd77magref', 'mgd77magref', 'Evaluate the IGRF or CM4 magnetic field models', '', '1gmt'),
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/gmt.git
More information about the Pkg-grass-devel
mailing list