diff -Nru gmt-5.2.1+dfsg/debian/changelog gmt-5.2.1+dfsg/debian/changelog --- gmt-5.2.1+dfsg/debian/changelog 2016-01-28 22:07:48.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/changelog 2017-11-05 16:13:56.000000000 +0000 @@ -1,8 +1,62 @@ -gmt (5.2.1+dfsg-3build1) xenial; urgency=medium +gmt (5.2.1+dfsg-4ubuntu2~xenial6) xenial; urgency=medium - * No-change rebuild for netcdf transition. + * No change rebuild for GDAL 2.2.2 transition. - -- Matthias Klose Thu, 28 Jan 2016 22:07:48 +0000 + -- Angelos Tzotsos Sun, 05 Nov 2017 15:00:00 +0200 + +gmt (5.2.1+dfsg-4ubuntu2~xenial5) xenial; urgency=medium + + * No change rebuild for GDAL 2.2.1 transition. + + -- Angelos Tzotsos Tue, 25 Jul 2017 19:00:00 +0200 + +gmt (5.2.1+dfsg-4ubuntu2~xenial4) xenial; urgency=medium + + * No change rebuild for GDAL 2.2.0 transition. + + -- Angelos Tzotsos Fri, 02 Jun 2017 19:00:00 +0200 + +gmt (5.2.1+dfsg-4ubuntu2~xenial3) xenial; urgency=medium + + * No change rebuild for libtiff5 transition. + + -- Angelos Tzotsos Tue, 28 Mar 2017 22:00:00 +0200 + +gmt (5.2.1+dfsg-4ubuntu2~xenial2) xenial; urgency=medium + + * Rebuild for GDAL 2.1.3. + + -- Angelos Tzotsos Fri, 03 Feb 2017 20:00:00 +0200 + +gmt (5.2.1+dfsg-4ubuntu2~xenial1) xenial; urgency=medium + + * Rebuild for GDAL 2.1.2. + + -- Angelos Tzotsos Wed, 21 Dec 2016 22:00:00 +0200 + +gmt (5.2.1+dfsg-4ubuntu2~xenial0) xenial; urgency=medium + + * Rebuild for GDAL 2.1.0. + + -- Angelos Tzotsos Mon, 10 May 2016 02:50:00 +0200 + +gmt (5.2.1+dfsg-4ubuntu1) yakkety; urgency=medium + + * Fix build with glibc-2.23. + + -- Matthias Klose Fri, 29 Apr 2016 17:19:46 +0200 + +gmt (5.2.1+dfsg-4) unstable; urgency=medium + + * Update Vcs-Git URL to use HTTPS. + * Bump Standards-Version to 3.9.7, no changes. + * Add patches for various typos. + * Add lintian override for old-style-config-script-multiarch-path. + See: https://lists.debian.org/debian-devel/2016/01/msg00688.html + * Drop unused FLOCK CMake option. + * Add patch to fix build on sparc64. + + -- Bas Couwenberg Fri, 19 Feb 2016 02:43:47 +0100 gmt (5.2.1+dfsg-3) unstable; urgency=medium diff -Nru gmt-5.2.1+dfsg/debian/control gmt-5.2.1+dfsg/debian/control --- gmt-5.2.1+dfsg/debian/control 2015-11-15 20:19:52.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/control 2016-02-06 22:49:59.000000000 +0000 @@ -24,9 +24,9 @@ docbook-xsl, docbook-xml, xsltproc -Standards-Version: 3.9.6 +Standards-Version: 3.9.7 Vcs-Browser: https://anonscm.debian.org/cgit/pkg-grass/gmt.git -Vcs-Git: git://anonscm.debian.org/pkg-grass/gmt.git +Vcs-Git: https://anonscm.debian.org/git/pkg-grass/gmt.git Homepage: http://gmt.soest.hawaii.edu/projects/gmt Package: gmt diff -Nru gmt-5.2.1+dfsg/debian/libgmt-dev.lintian-overrides gmt-5.2.1+dfsg/debian/libgmt-dev.lintian-overrides --- gmt-5.2.1+dfsg/debian/libgmt-dev.lintian-overrides 1970-01-01 00:00:00.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/libgmt-dev.lintian-overrides 2016-02-07 00:38:41.000000000 +0000 @@ -0,0 +1,3 @@ +# False positive, libgmt-dev is not marked as Multi-Arch +libgmt-dev: old-style-config-script-multiarch-path usr/bin/gmt-config * + diff -Nru gmt-5.2.1+dfsg/debian/patches/alpha-sighandler.patch gmt-5.2.1+dfsg/debian/patches/alpha-sighandler.patch --- gmt-5.2.1+dfsg/debian/patches/alpha-sighandler.patch 2015-11-21 19:12:04.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/patches/alpha-sighandler.patch 2015-11-29 20:46:08.000000000 +0000 @@ -1,6 +1,7 @@ Description: Fix build on alpha. Author: Bas Couwenberg Forwarded: http://gmt.soest.hawaii.edu/issues/819 +Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15281 --- a/src/common_sighandler.c +++ b/src/common_sighandler.c diff -Nru gmt-5.2.1+dfsg/debian/patches/glibc-fixes.diff gmt-5.2.1+dfsg/debian/patches/glibc-fixes.diff --- gmt-5.2.1+dfsg/debian/patches/glibc-fixes.diff 1970-01-01 00:00:00.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/patches/glibc-fixes.diff 2016-04-29 15:19:37.000000000 +0000 @@ -0,0 +1,13 @@ +Index: b/src/xyz2grd.c +=================================================================== +--- a/src/xyz2grd.c ++++ b/src/xyz2grd.c +@@ -749,7 +749,7 @@ int GMT_xyz2grd (void *V_API, int mode, + if (GMT_is_verbose (GMT, GMT_MSG_VERBOSE)) { + char line[GMT_BUFSIZ], e_value[GMT_LEN32]; + sprintf (line, "%s\n", GMT->current.setting.format_float_out); +- (GMT_is_dnan (GMT->common.d.active[GMT_IN])) ? sprintf (e_value, "NaN") : sprintf (e_value, GMT->current.setting.format_float_out, GMT->common.d.nan_proxy[GMT_IN]); ++ (GMT->common.d.active[GMT_IN]) ? sprintf (e_value, GMT->current.setting.format_float_out, GMT->common.d.nan_proxy[GMT_IN]) : sprintf (e_value, "NaN"); + GMT_Report (API, GMT_MSG_VERBOSE, "Data records read: %" PRIu64 " used: %" PRIu64 " nodes filled: %" PRIu64 " nodes empty: %" PRIu64 " [set to %s]\n", + n_read, n_used, n_filled, n_empty, e_value); + if (n_bad) GMT_Report (API, GMT_MSG_VERBOSE, "%" PRIu64 " records unreadable\n", n_bad); diff -Nru gmt-5.2.1+dfsg/debian/patches/overridden-typo.patch gmt-5.2.1+dfsg/debian/patches/overridden-typo.patch --- gmt-5.2.1+dfsg/debian/patches/overridden-typo.patch 1970-01-01 00:00:00.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/patches/overridden-typo.patch 2016-02-07 00:38:41.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix 'overrided' typo, replace with 'overridden'. +Author: Bas Couwenberg +Forwarded: http://gmt.soest.hawaii.edu/issues/855 +Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15578 + +--- a/src/grdtrack.c ++++ b/src/grdtrack.c +@@ -808,7 +808,7 @@ int GMT_grdtrack (void *V_API, int mode, + if (GMT_is_geographic (GMT, GMT_IN)) { /* Convert to km if geographic or degrees if arc-units */ + if (!GMT->current.map.dist[GMT_MAP_DIST].arc) Ctrl->E.step *= GMT->current.proj.DIST_M_PR_DEG; /* Convert from degrees to meters or from min/secs to degrees */ + Ctrl->E.step *= GMT->current.map.dist[GMT_MAP_DIST].scale; /* Scale to chosen unit */ +- GMT_Report (API, GMT_MSG_LONG_VERBOSE, "Default sampling interval in -E is %g %c (may be overrided by -E modifiers).\n", Ctrl->E.step, Ctrl->E.unit); ++ GMT_Report (API, GMT_MSG_LONG_VERBOSE, "Default sampling interval in -E is %g %c (may be overridden by -E modifiers).\n", Ctrl->E.step, Ctrl->E.unit); + } + if (Ctrl->G.n_grids == 1) { /* May use min/max for a single grid */ + GMT_grd_minmax (GMT, GC[0].G, xyz); diff -Nru gmt-5.2.1+dfsg/debian/patches/series gmt-5.2.1+dfsg/debian/patches/series --- gmt-5.2.1+dfsg/debian/patches/series 2015-11-21 19:12:04.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/patches/series 2016-04-29 14:43:41.000000000 +0000 @@ -3,3 +3,8 @@ manpage-section.patch hppa-sighandler.patch alpha-sighandler.patch +supported-typo.patch +overridden-typo.patch +written-typo.patch +sparc-sighandler.patch +glibc-fixes.diff diff -Nru gmt-5.2.1+dfsg/debian/patches/sparc-sighandler.patch gmt-5.2.1+dfsg/debian/patches/sparc-sighandler.patch --- gmt-5.2.1+dfsg/debian/patches/sparc-sighandler.patch 1970-01-01 00:00:00.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/patches/sparc-sighandler.patch 2016-02-19 01:39:12.000000000 +0000 @@ -0,0 +1,18 @@ +Description: Fix build on sparc64. +Author: Bas Couwenberg + +--- a/src/common_sighandler.c ++++ b/src/common_sighandler.c +@@ -85,6 +85,12 @@ void backtrace_symbols_fd(void *const *b + # define UC_IP(uc) ((void *) (uc)->uc_mcontext.sc_iaoq[0]) + # elif defined(__s390__) + # define UC_IP(uc) ((void *) (uc)->uc_mcontext.psw.addr) ++# elif defined(__sparc__) ++# if defined (__arch64__) ++# define UC_IP(uc) ((void *) (uc)->uc_mcontext.mc_gregs[MC_PC]) ++# else ++# define UC_IP(uc) ((void *) (uc)->uc_mcontext.gregs[REG_PC]) ++# endif + # else + # define UC_IP(uc) ((void *) (uc)->uc_mcontext.gregs[REG_EIP]) + # endif diff -Nru gmt-5.2.1+dfsg/debian/patches/supported-typo.patch gmt-5.2.1+dfsg/debian/patches/supported-typo.patch --- gmt-5.2.1+dfsg/debian/patches/supported-typo.patch 1970-01-01 00:00:00.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/patches/supported-typo.patch 2016-02-07 00:38:41.000000000 +0000 @@ -0,0 +1,38 @@ +Description: Fix 'suported' typo, replace with 'supported'. +Author: Bas Couwenberg +Forwarded: http://gmt.soest.hawaii.edu/issues/855 +Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15578 + +--- a/src/gmt_customio.c ++++ b/src/gmt_customio.c +@@ -1746,7 +1746,7 @@ int GMT_gdal_read_grd (struct GMT_CTRL * + for (j = 0; j < header->size; j++) + grid[j] = (float)from_gdalread->Int32.data[j+i]; + else { +- GMT_Report (GMT->parent, GMT_MSG_NORMAL, "ERROR data type not suported with gdalread in gmt_customio.\n"); ++ GMT_Report (GMT->parent, GMT_MSG_NORMAL, "ERROR data type not supported with gdalread in gmt_customio.\n"); + return (GMT_GRDIO_OPEN_FAILED); + } + } +--- a/src/gmt_gdalwrite.c ++++ b/src/gmt_gdalwrite.c +@@ -100,7 +100,7 @@ int GMT_gdalwrite (struct GMT_CTRL *GMT, + n_byteOffset = 4; + } + else { +- GMT_Report (GMT->parent, GMT_MSG_NORMAL, "GMT_gdalwrite: Unsuported input data class!\n"); ++ GMT_Report (GMT->parent, GMT_MSG_NORMAL, "GMT_gdalwrite: Unsupported input data class!\n"); + return(-1); + } + +--- a/src/psconvert.c ++++ b/src/psconvert.c +@@ -870,7 +870,7 @@ int GMT_psconvert (void *V_API, int mode + Ctrl->T.device == GS_DEV_JPGG || Ctrl->T.device == GS_DEV_TIF || + Ctrl->T.device == GS_DEV_TIFG || Ctrl->T.device == GS_DEV_PNG || + Ctrl->T.device == GS_DEV_TPNG || Ctrl->T.device == GS_DEV_PNGG) ) { +- GMT_Report (API, GMT_MSG_NORMAL, "Error: As far as we know selected raster type is unsuported by GE.\n"); ++ GMT_Report (API, GMT_MSG_NORMAL, "Error: As far as we know selected raster type is unsupported by GE.\n"); + } + + if (Ctrl->W.active) { /* Implies -P and -A (unless -A- is set ) */ diff -Nru gmt-5.2.1+dfsg/debian/patches/written-typo.patch gmt-5.2.1+dfsg/debian/patches/written-typo.patch --- gmt-5.2.1+dfsg/debian/patches/written-typo.patch 1970-01-01 00:00:00.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/patches/written-typo.patch 2016-02-07 00:38:41.000000000 +0000 @@ -0,0 +1,16 @@ +Description: Fix 'writen' typo, replace with 'written'. +Author: Bas Couwenberg +Forwarded: http://gmt.soest.hawaii.edu/issues/855 +Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/15578 + +--- a/doc/rst/source/gmtget.rst ++++ b/doc/rst/source/gmtget.rst +@@ -27,7 +27,7 @@ Required Arguments + + PARAMETER + Provide one or several parameters of interest. The current value of +- those parameters will be writen to *stdout*. For a complete listing ++ those parameters will be written to *stdout*. For a complete listing + of available parameters and their meaning, see the :doc:`gmt.conf` man page. + + Optional Arguments diff -Nru gmt-5.2.1+dfsg/debian/rules gmt-5.2.1+dfsg/debian/rules --- gmt-5.2.1+dfsg/debian/rules 2015-11-13 00:06:46.000000000 +0000 +++ gmt-5.2.1+dfsg/debian/rules 2016-02-07 00:38:41.000000000 +0000 @@ -24,7 +24,6 @@ -DFFTW3_ROOT=/usr \ -DGDAL_ROOT=/usr \ -DPCRE_ROOT=/usr \ - -DFLOCK=on \ -DGMT_INSTALL_MODULE_LINKS=off \ -DGMT_INSTALL_TRADITIONAL_FOLDERNAMES=off \ -DLICENSE_RESTRICTED=LGPL