CMakeLists.txt

 #
-#	$Id: CMakeLists.txt 18037 2017-04-25 04:04:41Z pwessel $
+#	$Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
 #
-#	Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+#	Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
 #	See LICENSE.TXT file for copying and redistribution conditions.
 #
 #	This program is free software; you can redistribute it and/or modify

README

-$Id: README 18132 2017-05-05 03:05:46Z pwessel $
+$Id: README 19521 2017-12-27 22:38:24Z pwessel $
 
 == Information for installing GMT 5 ==
 
@@ -98,9 +98,7 @@ SOEST, U. of Hawaii                     ftp.soest.hawaii.edu
 Lab for Satellite Altimetry, NOAA       ibis.grdl.noaa.gov
 IRIS, Washington, US                    ftp.iris.washington.edu
 IAG-USP, U. of Sao Paulo, BRAZIL        ftp.iag.usp.br
-Dep. Geology, U. in Oslo, NORWAY        ftp.geologi.uio.no
 ISV, Hokkaido U, Sapporo, JAPAN         ftp.eos.hokudai.ac.jp
-GDS, Vienna U. of Technology, AUSTRIA   gd.tuwien.ac.at
 TENET, Tertiary Education & Research Networks, SOUTH AFRICA
                                         gmt.mirror.ac.za
 

README.CMake

 ////
-$Id: README.CMake 18132 2017-05-05 03:05:46Z pwessel $
+$Id: README.CMake 19521 2017-12-27 22:38:24Z pwessel $
 
-Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis
+Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis
 and F. Wobbe. See LICENSE.TXT file for copying and redistribution conditions.
 
 Contact info: http://gmt.soest.hawaii.edu/

cmake/ConfigDefault.cmake

 #
-# $Id: ConfigDefault.cmake 18461 2017-06-25 01:18:55Z pwessel $
+# $Id: ConfigDefault.cmake 19529 2017-12-28 08:30:55Z pwessel $
 #
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -37,18 +37,18 @@ set (GMT_PACKAGE_DESCRIPTION_SUMMARY "The Generic Mapping Tools")
 
 # GMT_VERSION_YEAR is set to current date in
 # cmake/modules/ConfigCMake.cmake if not specified here:
-set (GMT_VERSION_YEAR "2017")
+set (GMT_VERSION_YEAR "2018")
 
 # The GMT package version.
 set (GMT_PACKAGE_VERSION_MAJOR 5)
 set (GMT_PACKAGE_VERSION_MINOR 4)
-set (GMT_PACKAGE_VERSION_PATCH 2)
+set (GMT_PACKAGE_VERSION_PATCH 3)
 
 # The subversion revision of the GMT source code.
 # This is manually set when making GMT *public* releases.
 # However, when making internal releases or just an ordinary developer build, leave it
 # empty; if it is empty, the revision number is automatically populated for you on build.
-set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "18461")
+set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "19528")
 #set (GMT_SOURCE_CODE_CONTROL_VERSION_STRING "")
 
 # The GMT package version.

cmake/ConfigUserTemplate.cmake

 #
-# $Id: ConfigUserTemplate.cmake 18366 2017-06-12 01:57:16Z pwessel $
+# $Id: ConfigUserTemplate.cmake 19521 2017-12-27 22:38:24Z pwessel $
 #
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify it

cmake/dist/CMakeLists.txt

 #
-# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
 #
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

cmake/modules/CopyDirIfDifferent.cmake

 #
-# $Id: CopyDirIfDifferent.cmake 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CopyDirIfDifferent.cmake 19521 2017-12-27 22:38:24Z pwessel $
 #
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

cmake/modules/CreateDebugSym.cmake

 #
-# $Id: CreateDebugSym.cmake 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CreateDebugSym.cmake 19521 2017-12-27 22:38:24Z pwessel $
 #
 # - Generates Mac .dSYM bundle
 # CREATE_DEBUG_SYM ( DESTINATION TARGETS )
@@ -7,7 +7,7 @@
 #  DESTINATION - destination directory for installed targets
 #  TARGETS     - list of targets
 #
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

cmake/modules/GmtGenExtraHeaders.cmake

 #
-# $Id: GmtGenExtraHeaders.cmake 18101 2017-05-01 07:09:55Z pwessel $
+# $Id: GmtGenExtraHeaders.cmake 19521 2017-12-27 22:38:24Z pwessel $
 #
 # - Generates extra header files
 # GMT_CREATE_HEADERS ()
 #
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

cmake/modules/GmtHelperMacros.cmake

 #
-# $Id: GmtHelperMacros.cmake 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: GmtHelperMacros.cmake 19521 2017-12-27 22:38:24Z pwessel $
 #
 # - Useful CMake macros
 #
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

cmake/modules/ManageString.cmake

 #
-# $Id: ManageString.cmake 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: ManageString.cmake 19521 2017-12-27 22:38:24Z pwessel $
 #
 # - Collection of String utility macros.
 # Defines the following macros:
@@ -78,7 +78,7 @@
 #       + PADDING: (Optional) apply padding at the location by the marker
 #           string PADDING
 #
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

debian/changelog

+gmt (5.4.3+dfsg-1~bpo9+1) stretch-backports; urgency=medium
+
+  * Rebuild for stretch-backports.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Mon, 08 Jan 2018 07:26:58 +0100
+
+gmt (5.4.3+dfsg-1) unstable; urgency=medium
+
+  * New upstream release.
+  * Update copyright years for copyright holders.
+  * Update symbols for 5.4.3.
+  * Bump Standards-Version to 4.1.3, no changes.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Wed, 03 Jan 2018 08:06:26 +0100
+
+gmt (5.4.2+dfsg-2) unstable; urgency=medium
+
+  * Change priority from extra to optional.
+  * Bump Standards-Version to 4.1.2, changes: priority.
+  * Add python3-sphinx to build dependencies.
+  * Strip trailing whitespace from changelog & rules.
+  * Add some Multi-Arch fields suggested by Multiarch hinter.
+  * Drop obsolete dbg package.
+  * Add lintian override for debian-watch-uses-insecure-uri.
+
+ -- Bas Couwenberg <sebastic@debian.org>  Tue, 26 Dec 2017 19:59:39 +0100
+
 gmt (5.4.2+dfsg-1~bpo9+1) stretch-backports; urgency=medium
 
   * Rebuild for stretch-backports.

debian/control

@@ -3,8 +3,8 @@ Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
 Uploaders: Francesco Paolo Lovergine <frankie@debian.org>,
            Bas Couwenberg <sebastic@debian.org>
 Section: science
-Priority: extra
-Build-Depends: debhelper (>= 9),
+Priority: optional
+Build-Depends: debhelper (>= 9.20160114),
                chrpath,
                cmake,
                ghostscript,
@@ -18,6 +18,7 @@ Build-Depends: debhelper (>= 9),
                libxaw7-dev,
                libxmu-headers,
                python-sphinx,
+               python3-sphinx,
                texlive,
                texlive-latex-extra,
                zlib1g-dev,
@@ -25,7 +26,7 @@ Build-Depends: debhelper (>= 9),
                docbook-xsl,
                docbook-xml,
                xsltproc
-Standards-Version: 4.0.0
+Standards-Version: 4.1.3
 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gmt.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gmt.git -b stretch-backports
 Homepage: http://gmt.soest.hawaii.edu/
@@ -57,6 +58,7 @@ Description: Generic Mapping Tools
 
 Package: gmt-common
 Architecture: all
+Multi-Arch: foreign
 Depends: ${misc:Depends}
 Breaks: gmt (<< 5.1.2),
         gmt-manpages (<< 5.1.2)
@@ -78,6 +80,7 @@ Description: Generic Mapping Tools - Architecture-independent files
 
 Package: libgmt5
 Architecture: any
+Multi-Arch: same
 Section: libs
 Depends: ${shlibs:Depends},
          ${misc:Depends}
@@ -109,27 +112,9 @@ Description: Generic Mapping Tools Library - Development files
  This package contains the files used for development of programs that
  use the GMT libraries (headers).
 
-Package: gmt-dbg
-Architecture: any
-Section: debug
-Depends: libgmt5 (= ${binary:Version}),
-         ${misc:Depends}
-Description: Generic Mapping Tools Library - Debugging symbols
- GMT is a collection of tools that allow users to manipulate
- (x,y) and (x,y,z) data sets (including filtering, trend fitting, gridding,
- projecting, etc.) and produce Encapsulated PostScript File (EPS) illustrations
- ranging from simple x-y plots through contour maps to artificially illuminated
- surfaces and 3-D perspective views in black and white, gray tone, hachure
- patterns, and 24-bit color.
- .
- GMT supports many common map projections plus linear, log, and power scaling,
- and comes with support data such as coastlines, rivers, and political
- boundaries.
- .
- This package contains debugging symbols for GMT.
-
 Package: gmt-doc
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: libjs-jquery,
          libjs-underscore,
@@ -155,6 +140,7 @@ Description: Documentation for GMT, the Generic Mapping Tools
 
 Package: gmt-examples
 Architecture: all
+Multi-Arch: foreign
 Section: doc
 Depends: ${misc:Depends}
 Suggests: gmt

debian/copyright

@@ -32,9 +32,12 @@ Files-Excluded: src/triangle.c
  man_release/*
 
 Files: *
-Copyright: 1991-2017, P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
-           1991-2017, T. Henstock
-           2016-2017, Dongdong Tian
+Copyright: 1991-2018, P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis and F. Wobbe
+           1991-2018, T. Henstock
+           2004-2018, Michael Chandler
+           2009-2018, David Sandwell
+           2013-2018, the GMT project
+           2016-2018, Dongdong Tian
            1996-2012, G. Patau
 License: LGPL-3+
 

debian/libgmt5.symbols

@@ -576,6 +576,7 @@ libgmt.so.5 libgmt5 #MINVER#
  gmt_is_a_blank_line@Base 5.3.1
  gmt_is_agc_grid@Base 5.3.1
  gmt_is_ascii_record@Base 5.3.1
+ gmt_is_cpt_master@Base 5.4.3
  gmt_is_esri_grid@Base 5.3.1
  gmt_is_gdal_grid@Base 5.3.1
  gmt_is_mgg2_grid@Base 5.3.1
@@ -775,6 +776,7 @@ libgmt.so.5 libgmt5 #MINVER#
  gmt_scanf_arg@Base 5.3.1
  gmt_segmentize_data@Base 5.3.1
  gmt_segmentize_syntax@Base 5.3.1
+ gmt_set_R_from_grd@Base 5.4.3
  gmt_set_V@Base 5.4.0
  gmt_set_cartesian@Base 5.3.1
  gmt_set_cols@Base 5.3.1
@@ -932,6 +934,7 @@ libgmt.so.5 libgmt5 #MINVER#
  gmtinit_backwards_SQ_parsing@Base 5.3.1
  gmtinit_conf@Base 5.4.0
  gmtinit_conf_US@Base 5.4.0
+ gmtinit_parse_n_option@Base 5.4.3
  gmtinit_update_keys@Base 5.4.0
  gmtio_ascii_textinput@Base 5.3.1
  gmtlib_akima@Base 5.3.1

debian/rules

@@ -111,7 +111,7 @@ override_dh_compress:
 	dh_compress -X.pdf -Xusr/share/doc/gmt-examples/examples/
 
 override_dh_strip:
-	dh_strip --dbg-package=gmt-dbg
+	dh_strip --dbgsym-migration='gmt-dbg (<< 5.4.2+dfsg-2~)'
 
 override_dh_makeshlibs:
 	dh_makeshlibs -- -v$(UPSTREAM_VERSION)

debian/source.lintian-overrides

+# Download archive not available over HTTPS
+gmt source: debian-watch-uses-insecure-uri ftp://ftp.soest.hawaii.edu/gmt/
+

doc/CMakeLists.txt

 #
-# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
 #
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

doc/examples/CMakeLists.txt

 #
-# $Id: CMakeLists.txt 17451 2017-01-16 21:36:06Z pwessel $
+# $Id: CMakeLists.txt 19521 2017-12-27 22:38:24Z pwessel $
 #
-# Copyright (c) 1991-2017 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
+# Copyright (c) 1991-2018 by P. Wessel, W. H. F. Smith, R. Scharroo, J. Luis, and F. Wobbe
 # See LICENSE.TXT file for copying and redistribution conditions.
 #
 # This program is free software; you can redistribute it and/or modify

doc/examples/animate.in

 #!/bin/bash
 #
-# $Id: animate.in 13990 2015-01-26 18:00:58Z pwessel $
+# $Id: animate.in 18471 2017-06-26 23:37:11Z pwessel $
 #
 # Bash script for creating videos of the animation examples.
 # The videos will optionally be included in the RST gallery.
@@ -72,11 +72,16 @@ exec_dir="@CMAKE_CURRENT_BINARY_DIR@/${script_dir}"
 rm -rf "$exec_dir"
 mkdir -p "$exec_dir"
 cd "$exec_dir"
-GLOBIGNORE="*.bat:*.ps:*.sh"
-for file in "$src"/* ; do
+# The GLOBIGNORE is not working for Paul on OSX - unknown why.
+# Until this can be solved I have replaced it with an egrep.
+#GLOBIGNORE="*.bat:*.ps:*.sh"
+#for file in "$src"/* ; do
+#  test -f "$file" && ln -s "$file" .
+#done
+#unset GLOBIGNORE
+for file in `ls "$src"/* | egrep -v '.bat$|.ps$|.sh$'` ; do
   test -f "$file" && ln -s "$file" .
 done
-unset GLOBIGNORE
 
 # Start with proper GMT defaults
 gmt set -Du FORMAT_TIME_STAMP "Version 5"