[gmt] 01/01: Merge tag 'debian/5.4.2+dfsg-1' into stretch-backports

Bas Couwenberg sebastic at debian.org
Sun Jul 2 10:22:16 UTC 2017


This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch stretch-backports
in repository gmt.

commit ce19197f880cb902115920b98e3830c9e65337e5
Merge: 9af3727 ac9ce41
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 2 11:33:25 2017 +0200

    Merge tag 'debian/5.4.2+dfsg-1' into stretch-backports

 cmake/ConfigDefault.cmake                          |    8 +-
 cmake/ConfigUserTemplate.cmake                     |    3 +-
 cmake/modules/ConfigureChecks.cmake                |   23 +-
 cmake/modules/FindGDAL.cmake                       |    2 +-
 debian/changelog                                   |   29 +-
 debian/control                                     |    2 +-
 debian/libgmt5.symbols                             |   25 +-
 debian/patches/manpage-section.patch               |    4 +-
 debian/rules                                       |    7 +-
 debian/tests/control                               |    3 +
 doc/examples/ex02/example_02.bat                   |    6 +-
 doc/examples/ex02/example_02.ps                    |   51 +-
 doc/examples/ex02/example_02.sh                    |    6 +-
 doc/examples/ex29/example_29.bat                   |    4 +-
 doc/examples/ex29/mars370.txt                      |    2 +-
 doc/examples/ex31/example_31.ps                    |   40 +-
 doc/examples/ex32/example_32.ps                    | 3390 ++++++++++----------
 doc/examples/ex35/example_35.ps                    | 1377 ++------
 doc/examples/ex39/example_39.ps                    | 2733 ++--------------
 doc/rst/conf.py.in                                 |    1 +
 doc/rst/source/GMT_API.rst                         |   14 +-
 doc/rst/source/GMT_Docs.rst                        |  107 +-
 doc/rst/source/GMT_Tutorial.rst                    |  224 +-
 doc/rst/source/explain_-V_full.rst_                |    2 +-
 doc/rst/source/explain_-h_full.rst_                |    4 +-
 doc/rst/source/explain_-icols_full.rst_            |    2 +-
 doc/rst/source/explain_-ocols_full.rst_            |    2 +-
 .../gallery/users_contrib_symbols/geo-cleavage.rst |    2 +-
 .../users_contrib_symbols/geo-cleavage_hor.rst     |    2 +-
 .../users_contrib_symbols/geo-cleavage_vert.rst    |    2 +-
 .../users_contrib_symbols/geo-foliation-2.rst      |    2 +-
 .../users_contrib_symbols/geo-foliation-3.rst      |    2 +-
 .../users_contrib_symbols/geo-foliation.rst        |    2 +-
 .../users_contrib_symbols/geo-foliation_hor.rst    |    2 +-
 .../users_contrib_symbols/geo-foliation_vert.rst   |    2 +-
 .../gallery/users_contrib_symbols/geo-joint.rst    |    2 +-
 .../users_contrib_symbols/geo-joint_hor.rst        |    2 +-
 .../users_contrib_symbols/geo-joint_vert.rst       |    2 +-
 .../users_contrib_symbols/geo-lineation-2.rst      |    2 +-
 .../users_contrib_symbols/geo-lineation-3.rst      |    2 +-
 .../users_contrib_symbols/geo-lineation.rst        |    2 +-
 .../users_contrib_symbols/geo-lineation_hor.rst    |    2 +-
 .../users_contrib_symbols/geo-lineation_vert.rst   |    2 +-
 .../gallery/users_contrib_symbols/geo-plane.rst    |    2 +-
 .../users_contrib_symbols/geo-plane_gentle.rst     |    2 +-
 .../users_contrib_symbols/geo-plane_hor.rst        |    2 +-
 .../users_contrib_symbols/geo-plane_inv.rst        |    2 +-
 .../users_contrib_symbols/geo-plane_medium.rst     |    2 +-
 .../users_contrib_symbols/geo-plane_rake.rst       |    2 +-
 .../users_contrib_symbols/geo-plane_steep.rst      |    2 +-
 .../users_contrib_symbols/geo-plane_und.rst        |    2 +-
 .../users_contrib_symbols/geo-plane_vert.rst       |    2 +-
 doc/rst/source/gmtlogo.rst                         |    2 +-
 doc/rst/source/grdimage.rst                        |    4 +-
 doc/rst/source/grdlandmask.rst                     |   13 +-
 doc/rst/source/grdmask.rst                         |   14 +-
 doc/rst/source/grdview.rst                         |    2 +-
 doc/rst/source/project.rst                         |    2 +-
 doc/rst/source/psbasemap.rst                       |    4 +-
 doc/rst/source/psclip.rst                          |    4 +-
 doc/rst/source/psconvert.rst                       |    5 +
 doc/rst/source/pssolar.rst                         |    2 +-
 doc/rst/source/triangulate.rst                     |   21 +-
 doc/scripts/GMT_App_K_1.ps                         |  511 +--
 doc/scripts/GMT_App_K_2.ps                         |  612 ++--
 doc/scripts/GMT_grinten.ps                         |  180 +-
 doc/scripts/GMT_tut_11.sh                          |    4 +-
 doc/scripts/GMT_tut_12.sh                          |    4 +-
 doc/scripts/GMT_tut_13.sh                          |    4 +-
 doc/scripts/GMT_tut_15.sh                          |    6 +-
 doc/scripts/GMT_tut_16.sh                          |    8 +-
 doc/scripts/GMT_tut_17.sh                          |    4 +-
 doc/scripts/GMT_tut_18.sh                          |    6 +-
 doc/scripts/GMT_tut_19.sh                          |    6 +-
 doc/scripts/GMT_tut_5.ps                           | 1103 +------
 doc/scripts/GMT_tut_7.sh                           |    4 +-
 doc/scripts/GMT_tut_8.sh                           |    6 +-
 doc/scripts/GMT_tut_9.sh                           |    5 +-
 share/tools/gmt5syntax.in                          |    4 +-
 src/blockmean.c                                    |    4 +-
 src/blockmedian.c                                  |    4 +-
 src/blockmode.c                                    |    4 +-
 src/common_math.h                                  |    8 +-
 src/common_sighandler.c                            |    4 +-
 src/filter1d.c                                     |    6 +-
 src/gmt.c                                          |   25 +-
 src/gmt.h                                          |   10 +-
 src/gmt_api.c                                      |  220 +-
 src/gmt_calclock.c                                 |    5 +-
 src/gmt_common.h                                   |    8 +-
 src/gmt_config.h.in                                |    7 +-
 src/gmt_constants.h                                |    8 +-
 src/gmt_dcw.c                                      |   33 +-
 src/gmt_defaults.h                                 |    3 +-
 src/gmt_gdal_librarified.c                         |   15 +-
 src/gmt_gdalread.c                                 |   20 +-
 src/gmt_gdalwrite.c                                |    4 +-
 src/gmt_grdio.c                                    |   31 +-
 src/gmt_init.c                                     |  335 +-
 src/gmt_io.c                                       |    5 +-
 src/gmt_macros.h                                   |   15 +-
 src/gmt_map.c                                      |  130 +-
 src/gmt_nc.c                                       |  156 +-
 src/gmt_notposix.c                                 |   44 +-
 src/gmt_notposix.h                                 |   10 +-
 src/gmt_parse.c                                    |   22 +-
 src/gmt_plot.c                                     |   39 +-
 src/gmt_proj.c                                     |   11 +-
 src/gmt_prototypes.h                               |    7 +-
 src/gmt_support.c                                  |   33 +-
 src/gmt_synopsis.h                                 |    6 +-
 src/gmt_vector.c                                   |   10 +-
 src/gmtconvert.c                                   |    6 +-
 src/gmtinfo.c                                      |    2 +-
 src/gmtlogo.c                                      |    6 +-
 src/gmtmath.c                                      |    8 +-
 src/gmtread.c                                      |   15 +-
 src/gmtselect.c                                    |    6 +-
 src/gmtspatial.c                                   |   17 +-
 src/grd2rgb.c                                      |    4 +-
 src/grdblend.c                                     |   32 +-
 src/grdfilter.c                                    |    4 +-
 src/grdfilter_mt.c                                 |    4 +-
 src/grdhisteq.c                                    |    6 +-
 src/grdimage.c                                     |   82 +-
 src/grdlandmask.c                                  |   19 +-
 src/grdmask.c                                      |   96 +-
 src/grdmath.c                                      |   18 +-
 src/grdproject.c                                   |    4 +-
 src/grdraster.c                                    |    3 +-
 src/grdsample.c                                    |    4 +-
 src/grdvector.c                                    |    8 +-
 src/grdview.c                                      |   54 +-
 src/greenspline.c                                  |   10 +-
 src/gshhg/gshhg.c                                  |    6 +-
 src/gshhg/gshhg.h                                  |    3 +-
 src/img/img2grd.c                                  |    8 +-
 src/makecpt.c                                      |    4 +-
 src/mapproject.c                                   |   14 +-
 src/meca/pssac.c                                   |    2 +-
 src/mgd77/mgd77.c                                  |    8 +-
 src/mgd77/mgd77convert.c                           |    6 +-
 src/mgd77/mgd77header.c                            |   52 +-
 src/mgd77/mgd77info.c                              |    6 +-
 src/mgd77/mgd77list.c                              |    6 +-
 src/mgd77/mgd77manage.c                            |   14 +-
 src/mgd77/mgd77path.c                              |   11 +-
 src/mgd77/mgd77sniffer.c                           |   15 +-
 src/mgd77/mgd77track.c                             |   14 +-
 src/misc/dimfilter.c                               |    3 +-
 src/nearneighbor.c                                 |   15 +-
 src/postscriptlight.c                              |   28 +-
 src/postscriptlight.h                              |    3 +-
 src/potential/gmtflexure.c                         |   10 +-
 src/potential/gmtgravmag3d.c                       |   10 +-
 src/potential/gpsgridder.c                         |    6 +-
 src/potential/grdredpol.c                          |    4 +-
 src/potential/grdseamount.c                        |    3 +-
 src/potential/talwani2d.c                          |   12 +-
 src/potential/talwani3d.c                          |    7 +-
 src/psbasemap.c                                    |    4 +-
 src/psclip.c                                       |   11 +-
 src/pscoast.c                                      |    9 +-
 src/psconvert.c                                    |   43 +-
 src/pshistogram.c                                  |    8 +-
 src/psimage.c                                      |    6 +-
 src/psmask.c                                       |    4 +-
 src/psscale.c                                      |  107 +-
 src/pssolar.c                                      |    4 +-
 src/psternary.c                                    |    7 +-
 src/pswiggle.c                                     |   14 +-
 src/psxy.c                                         |   24 +-
 src/sample1d.c                                     |    6 +-
 src/segy/segy2grd.c                                |    4 +-
 src/sph2grd.c                                      |    4 +-
 src/sphdistance.c                                  |   12 +-
 src/sphinterpolate.c                               |    4 +-
 src/spotter/backtracker.c                          |    6 +-
 src/spotter/gmtpmodeler.c                          |    6 +-
 src/spotter/grdspotter.c                           |    4 +-
 src/spotter/hotspotter.c                           |    6 +-
 src/spotter/rotconverter.c                         |    6 +-
 src/ssrfpack.c                                     |   10 +-
 src/stripack.c                                     |   16 +-
 src/surface.c                                      |    4 +-
 src/surface_mt.c                                   |    2 -
 src/trend1d.c                                      |   13 +-
 src/triangulate.c                                  |    4 +-
 src/x2sys/x2sys.c                                  |   10 +-
 src/x2sys/x2sys_binlist.c                          |   11 +-
 src/x2sys/x2sys_cross.c                            |   10 +-
 src/x2sys/x2sys_datalist.c                         |    9 +-
 src/x2sys/x2sys_put.c                              |   12 +-
 src/x2sys/x2sys_report.c                           |   21 +-
 src/xyz2grd.c                                      |    3 +-
 195 files changed, 4799 insertions(+), 8206 deletions(-)

diff --cc debian/changelog
index 0387ed1,bc613f8..bd5215f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,34 @@@
- gmt (5.4.1+dfsg-1~bpo9+1) stretch-backports; urgency=medium
++gmt (5.4.2+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 +
 +  * Rebuild for stretch-backports.
 +  * Update branch in gbp.conf & Vcs-Git URL.
 +
-  -- Bas Couwenberg <sebastic at debian.org>  Fri, 23 Jun 2017 09:44:48 +0200
++ -- Bas Couwenberg <sebastic at debian.org>  Sun, 02 Jul 2017 11:33:11 +0200
++
+ gmt (5.4.2+dfsg-1) unstable; urgency=medium
+ 
+   * New upstream release.
+   * Drop m68k-support.patch, applied upstream.
+     Refresh manpage-section.patch.
+   * Update symbols for 5.4.2.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Tue, 27 Jun 2017 00:28:47 +0200
+ 
+ gmt (5.4.1+dfsg-3) unstable; urgency=medium
+ 
+   * Fix SOURCE_DATE_EPOCH use.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Mon, 26 Jun 2017 20:44:49 +0200
+ 
+ gmt (5.4.1+dfsg-2) unstable; urgency=medium
+ 
+   * Add patch by John Paul Adrian Glaubitz for m68k support.
+     (closes: #865726)
+   * Bump Standards-Version to 4.0.0, no changes.
+   * Add autopkgtest to test installability.
+   * Use pkg-info.mk variables instead of dpkg-parsechangelog output.
+ 
+  -- Bas Couwenberg <sebastic at debian.org>  Sat, 24 Jun 2017 11:31:13 +0200
  
  gmt (5.4.1+dfsg-1) unstable; urgency=medium
  
diff --cc debian/control
index 8b93337,cb28508..691a8ee
--- a/debian/control
+++ b/debian/control
@@@ -25,9 -25,9 +25,9 @@@ Build-Depends: debhelper (>= 9)
                 docbook-xsl,
                 docbook-xml,
                 xsltproc
- Standards-Version: 3.9.8
+ Standards-Version: 4.0.0
  Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gmt.git
 -Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gmt.git
 +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gmt.git -b stretch-backports
  Homepage: http://gmt.soest.hawaii.edu/
  
  Package: gmt

-- 
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