[gmt] 05/07: Drop spelling-errors.patch, applied upstream.
Bas Couwenberg
sebastic at debian.org
Sun Feb 26 12:45:59 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 774d7a000702c3e20c143015110ca0c437c7d9f9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Feb 26 12:10:38 2017 +0100
Drop spelling-errors.patch, applied upstream.
---
debian/changelog | 1 +
debian/patches/cmake | 247 -----------------------------------
debian/patches/series | 1 -
debian/patches/spelling-errors.patch | 120 -----------------
4 files changed, 1 insertion(+), 368 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 8b42b6a..974fd10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ gmt (5.3.2+dfsg-1) UNRELEASED; urgency=medium
* New upstream release.
* Update copyright years for copyright holders.
+ * Drop spelling-errors.patch, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Sun, 26 Feb 2017 11:56:02 +0100
diff --git a/debian/patches/cmake b/debian/patches/cmake
deleted file mode 100644
index fdecc13..0000000
--- a/debian/patches/cmake
+++ /dev/null
@@ -1,247 +0,0 @@
-Description: Add custom cmake configuration.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Forwarded: not-needed
-
---- /dev/null
-+++ b/cmake/ConfigUser.cmake
-@@ -0,0 +1,240 @@
-+#
-+# $Id: ConfigUserTemplate.cmake 12425 2013-11-01 10:09:27Z fwobbe $
-+#
-+# Copyright (c) 1991-2013 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
-+# under the terms of the GNU Lesser General Public License as published by the
-+# Free Software Foundation; version 3 or any later version.
-+#
-+# This program is distributed in the hope that it will be useful, but WITHOUT
-+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+# FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License
-+# for more details.
-+#
-+# Contact info: gmt.soest.hawaii.edu
-+# ----------------------------------------------------------------------------
-+
-+# Use this file to override variables in 'ConfigDefault.cmake' on a per-user
-+# basis. First copy 'ConfigUserTemplate.cmake' to 'ConfigUser.cmake', then
-+# edit 'ConfigUser.cmake'. 'ConfigUser.cmake' is not version controlled
-+# (currently listed in svn:ignore property)
-+#
-+# Note: CMake considers an empty string, "FALSE", "OFF", "NO", or any string
-+# ending in "-NOTFOUND" to be false (this happens to be case-insensitive, so
-+# "False", "off", "no", and "something-NotFound" are all false). Other values
-+# are true. Thus it does not matter whether you use TRUE and FALSE, ON and
-+# OFF, or YES and NO for your booleans.
-+
-+##
-+## Section 1: Installation paths
-+##
-+
-+# ============================================================================
-+# Basic setup begins here. All settings are optional. In most cases, setting
-+# CMAKE_INSTALL_PREFIX should be all you need to do in order to build GMT with
-+# reasonable defaults enabled.
-+# ============================================================================
-+
-+# Installation path (usually defaults to /usr/local) [auto]:
-+set (CMAKE_INSTALL_PREFIX "/usr")
-+
-+# Set install name suffix used for directories and gmt executables
-+# [undefined]:
-+#set (GMT_INSTALL_NAME_SUFFIX "suffix")
-+
-+# Install into traditional directory structure. Disable to install a
-+# distribution type directory structure (doc and share separated) [on]:
-+#set (GMT_INSTALL_TRADITIONAL_FOLDERNAMES OFF)
-+
-+# Install convenience links for GMT modules. Disable to install only the main
-+# gmt program and access modules as "gmt modulename options" [TRUE]:
-+set (GMT_INSTALL_MODULE_LINKS FALSE)
-+
-+# ============================================================================
-+# Advanced configuration begins here. Usually it is not necessary to edit any
-+# settings below. You should know what you are doing if you do though. Note:
-+# installation paths are relative to ${CMAKE_INSTALL_PREFIX} unless absolute
-+# path is given.
-+# ============================================================================
-+
-+# Set binary installation path [bin]:
-+set (GMT_BINDIR "bin")
-+
-+# Set library installation path [lib or lib64]:
-+set (GMT_LIBDIR "lib")
-+
-+# Set include installation path [include/gmt${GMT_INSTALL_NAME_SUFFIX}]:
-+set (GMT_INCLUDEDIR "include/gmt")
-+
-+# Set share installation path [share or share/gmt${GMT_INSTALL_NAME_SUFFIX}]:
-+set (GMT_DATADIR "share/gmt")
-+
-+# Set doc installation path [share/doc or
-+# share/doc/gmt${GMT_INSTALL_NAME_SUFFIX}]:
-+set (GMT_DOCDIR "share/doc/gmt")
-+
-+# Set manpage installation path [share/man or
-+# share/doc/gmt${GMT_INSTALL_NAME_SUFFIX}/man]:
-+set (GMT_MANDIR "share/man")
-+
-+# Install documentation files from this external location instead of creating
-+# new PDF and HTML documents from scratch [${GMT_SOURCE_DIR}/doc_release]:
-+set (GMT_INSTALL_EXTERNAL_DOC ON)
-+
-+# Install manual pages from this external location instead of creating the
-+# manpages from scratch [${GMT_SOURCE_DIR}/man_release]:
-+#set (GMT_INSTALL_EXTERNAL_MAN OFF)
-+
-+##
-+## Section 2: Build dependencies (should only be needed if CMake cannot
-+## automatically detect the rights version or path.)
-+##
-+
-+# Set path to GSHHG Shoreline Database [auto]:
-+#set (GSHHG_ROOT "gshhg_path")
-+
-+# Copy GSHHG files to $/coast [FALSE]:
-+#set (COPY_GSHHG TRUE)
-+
-+# Set path to DCW Digital Chart of the World for GMT [auto]:
-+#set (DCW_ROOT "dcw-gmt_path")
-+
-+# Copy DCW files to $/dcw [FALSE]:
-+#set (COPY_DCW TRUE)
-+
-+# Set location of NetCDF (can be root directory, path to header file or path
-+# to nc-config) [auto]:
-+#set (NETCDF_ROOT "netcdf_install_prefix")
-+
-+# Set location of GDAL (can be root directory, path to header file or path to
-+# gdal-config) [auto]:
-+#set (GDAL_ROOT "gdal_install_prefix")
-+
-+# Set location of PCRE (can be root directory, path to header file or path to
-+# pcre-config) [auto]:
-+#set (PCRE_ROOT "pcre_install_prefix")
-+
-+# Set location of single precision FFTW (can be root directory or path to
-+# header file) [auto]:
-+#set (FFTW3_ROOT "fftw_install_prefix")
-+
-+# Set location of ZLIB (can be root directory or path to header file) [auto]:
-+#set (ZLIB_ROOT "zlib_install_prefix")
-+
-+##
-+## Section 3: GMT features
-+##
-+
-+# Enforce GPL or LGPL conformity. Use this to disable routines that cannot be
-+# redistributed under the terms of the GPL or LGPL such as Shewchuk's
-+# triangulation (valid values are GPL, LGPL and off) [off]:
-+set (LICENSE_RESTRICTED LGPL)
-+
-+# Configure default units (possible values are SI and US) [SI]:
-+set (UNITS "SI")
-+
-+# Enable file locking [FALSE]:
-+#set (FLOCK TRUE)
-+
-+# Enable building of shared libraries [TRUE] (disable to use static libraries;
-+# not recommended):
-+#set (BUILD_SHARED_LIBS FALSE)
-+
-+# Build GMT shared lib with supplemental modules [TRUE]:
-+#set (BUILD_SUPPLEMENTS FALSE)
-+
-+##
-+## Section 4: Advanced tweaking
-+##
-+
-+#
-+# Testing and development
-+#
-+
-+# Enable running examples/tests with "ctest" or "make check" (out-of-source).
-+# Need to set either DO_EXAMPLES, DO_TESTS or both and uncomment the following
-+# line.
-+#enable_testing()
-+#set (DO_EXAMPLES TRUE)
-+#set (DO_TESTS TRUE)
-+# Number of parallel test jobs with "make check":
-+#set (N_TEST_JOBS 4)
-+
-+# Enable this option to run GMT programs from within ${GMT_BINARY_DIR} without
-+# installing or setting GMT_SHAREDIR and GMT_USERDIR first. This is required
-+# for testing [OFF]:
-+#set (SUPPORT_EXEC_IN_BINARY_DIR ON)
-+
-+# List extra sub-dirs of 'src' with a CMakeList.txt to build non-module codes
-+# that link against the full gmt libs (not just the API; for building codes
-+# that only need the GMT API, see the gmtextension project).
-+#set (EXTRA_BUILD_DIRS apidemo)
-+
-+# Directory in which to install the release sources per default
-+# [${GMT_BINARY_DIR}/gmt-${GMT_PACKAGE_VERSION}]:
-+#set (GMT_RELEASE_PREFIX "release-src-prefix")
-+
-+# If set to false, image conversion from PS images to PNG and PDF does
-+# not depend on the gmt binary target. Note: "make gmt" is then required
-+# before docs_depends [TRUE].
-+#set (GMT_DOCS_DEPEND_ON_GMT FALSE)
-+
-+#
-+# Debugging
-+#
-+
-+# Set build type can be: empty, Debug, Release, RelWithDebInfo or MinSizeRel
-+# [Release]:
-+#set (CMAKE_BUILD_TYPE Debug)
-+
-+# Extra debugging for developers:
-+#add_definitions(-DDEBUG)
-+#add_definitions(-DMEMDEBUG) # Turn on memory tracking see gmt_support.c for extra info
-+#set (CMAKE_C_FLAGS "-Wall -Wdeclaration-after-statement") # recommended even for release build
-+#set (CMAKE_C_FLAGS "-Wextra ${CMAKE_C_FLAGS}") # extra warnings
-+#set (CMAKE_C_FLAGS_DEBUG -ggdb3) # gdb debugging symbols
-+#set (CMAKE_C_FLAGS_RELEASE "-ggdb3 -O2 -Wuninitialized") # check uninitialized variables
-+#set (CMAKE_LINK_DEPENDS_DEBUG_MODE TRUE) # debug link dependencies
-+
-+#
-+# System specific tweaks
-+#
-+
-+# This is for GCC on Solaris to avoid "relocations remain against allocatable
-+# but non-writable sections" problems:
-+#set (USER_GMTLIB_LINK_FLAGS -mimpure-text)
-+
-+# This may be needed to enable strdup and extended math functions with GCC and
-+# Suncc on Solaris:
-+#set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D__EXTENSIONS__")
-+
-+# Do not warn when building with Windows SDK or Visual Studio Express:
-+#set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS_NO_WARNINGS ON)
-+
-+# Manually select runtime library when compiling with Windows SDK or Visual
-+# Studio Express:
-+#set (CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS c:/Windows/System32/msvcr100.dll)
-+
-+# If your NetCDF library is static (not recommended, applies to Windows only)
-+#set (NETCDF_STATIC TRUE)
-+
-+# If want to rename the DLLs to something else than the default (e.g. to
-+# append the bitness - Windows only)
-+#if (WIN32)
-+# set (BITAGE 32)
-+# # Detect if we are building a 32 or 64 bits version
-+# if (CMAKE_SIZEOF_VOID_P EQUAL 8)
-+# set (BITAGE 64)
-+# endif ()
-+# set (GMT_DLL_RENAME gmt_w${BITAGE})
-+# set (PSL_DLL_RENAME psl_w${BITAGE})
-+#endif(WIN32)
-+
-+# On Windows Visual C 2012 needs _ALLOW_KEYWORD_MACROS to build
-+#if(MSVC11)
-+# add_definitions(/D_ALLOW_KEYWORD_MACROS)
-+#endif(MSVC11)
-+
-+# vim: textwidth=78 noexpandtab tabstop=2 softtabstop=2 shiftwidth=2
diff --git a/debian/patches/series b/debian/patches/series
index e11373d..65bf2b3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
disable-triangle.patch
manpage-section.patch
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 79729a7..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,120 +0,0 @@
-Description: Fix spelling errors.
- * occours -> occurs
- * mutiple -> multiple
- * postive -> positive
- * ommited -> omitted
- * Quiting -> Quitting
- * verticies -> vertices
- * exlusive -> exclusive
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: http://gmt.soest.hawaii.edu/issues/985
-Applied-Upstream: http://gmt.soest.hawaii.edu/projects/gmt/repository/revisions/17237
-
---- a/src/meca/pspolar.c
-+++ b/src/meca/pspolar.c
-@@ -478,7 +478,7 @@ int GMT_pspolar (void *V_API, int mode,
- if (Ctrl->N.active) {
- gmt_map_outside (GMT, Ctrl->D.lon, Ctrl->D.lat);
- if (abs (GMT->current.map.this_x_status) > 1 || abs (GMT->current.map.this_y_status) > 1) {
-- GMT_Report (API, GMT_MSG_VERBOSE, "Point give by -D is outside map; no plotting occours.");
-+ GMT_Report (API, GMT_MSG_VERBOSE, "Point give by -D is outside map; no plotting occurs.");
- Return (GMT_NOERROR);
- };
- }
---- a/doc/rst/source/supplements/meca/pssac.rst
-+++ b/doc/rst/source/supplements/meca/pssac.rst
-@@ -125,7 +125,7 @@ Optional Arguments
-
- **r**: remove mean value
-
-- **i|q|r** can repeat mutiple times. For example, **-Frii** will convert acceleration to displacement.
-+ **i|q|r** can repeat multiple times. For example, **-Frii** will convert acceleration to displacement.
- The order of **i|q|r** controls the order of the data processing.
-
- .. _-G:
-@@ -134,7 +134,7 @@ Optional Arguments
- Paint positive or negative portion of traces.
- If only **-G** is used, default to fill the positive portion black.
-
-- **p**\|\ **n** controls the painting of postive **p**\ ortion or **n**\ egative portion.
-+ **p**\|\ **n** controls the painting of positive **p**\ ortion or **n**\ egative portion.
- Repeat **-G** option to specify fills for positive and negative portions, respectively.
-
- **+g**\ *fill*: color to fill
-@@ -180,7 +180,7 @@ Optional Arguments
-
- **-S**\ *sec_per_measure*\ [*unit*]
- Specify the time scale in *sec_per_measure* seconds per *unit* while plotting on geographic plots.
-- Use PROJ_LENGTH_UNIT if *unit* is ommited.
-+ Use PROJ_LENGTH_UNIT if *unit* is omitted.
-
- .. _-T:
-
---- a/src/meca/pssac.c
-+++ b/src/meca/pssac.c
-@@ -170,11 +170,11 @@ GMT_LOCAL int usage (struct GMTAPI_CTRL
- GMT_Message (API, GMT_TIME_NONE, "\t i: integral\n");
- GMT_Message (API, GMT_TIME_NONE, "\t q: square\n");
- GMT_Message (API, GMT_TIME_NONE, "\t r: remove mean value\n");
-- GMT_Message (API, GMT_TIME_NONE, "\t i|q|r can repeat mutiple times. -Frii will convert accerate to displacement.\n");
-+ GMT_Message (API, GMT_TIME_NONE, "\t i|q|r can repeat multiple times. -Frii will convert accerate to displacement.\n");
- GMT_Message (API, GMT_TIME_NONE, "\t The order of i|q|r controls the order of the data processing.\n");
-- GMT_Message (API, GMT_TIME_NONE, "\t-G Paint postive or negative portion of traces.\n");
-+ GMT_Message (API, GMT_TIME_NONE, "\t-G Paint positive or negative portion of traces.\n");
- GMT_Message (API, GMT_TIME_NONE, "\t If only -G is used, default to fill the positive portion black.\n");
-- GMT_Message (API, GMT_TIME_NONE, "\t [p|n] controls the painting of postive portion or negative portion. Repeat -G option to specify fills for pos/neg portion, respectively.\n");
-+ GMT_Message (API, GMT_TIME_NONE, "\t [p|n] controls the painting of positive portion or negative portion. Repeat -G option to specify fills for pos/neg portion, respectively.\n");
- GMT_Message (API, GMT_TIME_NONE, "\t +g<fill>: color to fill\n");
- GMT_Message (API, GMT_TIME_NONE, "\t +t<t0>/<t1>: paint traces between t0 and t1 only. The reference time of t0 and t1 is determined by -T option.\n");
- GMT_Message (API, GMT_TIME_NONE, "\t +z<zero>: define zero line. From <zero> to top is positive portion, from <zero> to bottom is negative portion.\n");
-@@ -188,7 +188,7 @@ GMT_LOCAL int usage (struct GMTAPI_CTRL
- GMT_Message (API, GMT_TIME_NONE, "\t <alpha> > 0, multiply all traces by size*r^alpha, r is the distance range in km.\n");
- GMT_Option (API, "O,P");
- GMT_Message (API, GMT_TIME_NONE, "\t-Q Plot traces vertically.\n");
-- GMT_Message (API, GMT_TIME_NONE, "\t-S Specify the time scale in seconds per <unit> while plotting on geographic plots. Use PROJ_LENGTH_UNIT if <unit> is ommited.\n");
-+ GMT_Message (API, GMT_TIME_NONE, "\t-S Specify the time scale in seconds per <unit> while plotting on geographic plots. Use PROJ_LENGTH_UNIT if <unit> is omitted.\n");
- GMT_Message (API, GMT_TIME_NONE, "\t-T Time alignment. \n");
- GMT_Message (API, GMT_TIME_NONE, "\t +t<tmark> align all trace along time mark. Choose <tmark> from -5(b), -4(e), -3(o), -2(a), 0-9(t0-t9).\n");
- GMT_Message (API, GMT_TIME_NONE, "\t +r<reduce_vel> reduce velocity in km/s.\n");
---- a/src/gmt_gdalread.c
-+++ b/src/gmt_gdalread.c
-@@ -417,7 +417,7 @@ GMT_LOCAL int populate_metadata (struct
- " This configuration is not supported.\n");
- GDALClose(hDataset);
- GDALDestroyDriverManager();
-- GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Quiting with error\n");
-+ GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Quitting with error\n");
- return(-1);
- }
-
-@@ -431,7 +431,7 @@ GMT_LOCAL int populate_metadata (struct
- || anSrcWin[1] + anSrcWin[3] > GDALGetRasterYSize(hDataset)) {
- GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Computed -srcwin falls outside raster size of %dx%d.\n",
- GDALGetRasterXSize(hDataset), GDALGetRasterYSize(hDataset));
-- GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Quiting with error\n");
-+ GMT_Report (GMT->parent, GMT_MSG_NORMAL, "Quitting with error\n");
- return(-1);
- }
- Ctrl->RasterXsize = nXSize = anSrcWin[2];
---- a/src/pscontour.c
-+++ b/src/pscontour.c
-@@ -950,7 +950,7 @@ int GMT_pscontour (void *V_API, int mode
- n_skipped++;
- }
- }
-- if (n_skipped) GMT_Report (API, GMT_MSG_VERBOSE, "Skipped %u triangles whose verticies are all outside the domain.\n", n_skipped);
-+ if (n_skipped) GMT_Report (API, GMT_MSG_VERBOSE, "Skipped %u triangles whose vertices are all outside the domain.\n", n_skipped);
- }
-
- if (Ctrl->C.cpt) { /* We already read the CPT */
---- a/doc/rst/source/supplements/potential/gmtgravmag3d.rst
-+++ b/doc/rst/source/supplements/potential/gmtgravmag3d.rst
-@@ -56,7 +56,7 @@ Required Arguments
-
- **-F**\ *xy_file*
- Provide locations where the anomaly will be computed. Note this
-- option is mutually exlusive with **-G**.
-+ option is mutually exclusive with **-G**.
-
- .. _-G:
-
--
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