[Git][debian-gis-team/saga][experimental] 4 commits: Update branch in gbp.conf & Vcs-Git URL.
Bas Couwenberg (@sebastic)
gitlab at salsa.debian.org
Thu Dec 16 08:59:56 GMT 2021
Bas Couwenberg pushed to branch experimental at Debian GIS Project / saga
Commits:
965106ea by Bas Couwenberg at 2021-12-16T06:45:58+01:00
Update branch in gbp.conf & Vcs-Git URL.
- - - - -
44dcead4 by Bas Couwenberg at 2021-12-16T07:25:52+01:00
Reinstate spelling-errors.patch.
- - - - -
9cc20da9 by Bas Couwenberg at 2021-12-16T07:27:49+01:00
Fix paths in copyright file.
- - - - -
8f065c97 by Bas Couwenberg at 2021-12-16T08:12:55+01:00
Update spelling-errors.patch.
- - - - -
6 changed files:
- debian/control
- debian/control.in
- debian/copyright
- debian/gbp.conf
- debian/patches/series
- debian/patches/spelling-errors.patch
Changes:
=====================================
debian/control
=====================================
@@ -19,7 +19,7 @@ Build-Depends: debhelper-compat (= 12),
swig
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/saga
-Vcs-Git: https://salsa.debian.org/debian-gis-team/saga.git
+Vcs-Git: https://salsa.debian.org/debian-gis-team/saga.git -b experimental
Homepage: http://www.saga-gis.org/
Package: saga
=====================================
debian/control.in
=====================================
@@ -20,7 +20,7 @@ Build-Depends: debhelper-compat (= 12),
swig
Standards-Version: 4.6.0
Vcs-Browser: https://salsa.debian.org/debian-gis-team/saga
-Vcs-Git: https://salsa.debian.org/debian-gis-team/saga.git
+Vcs-Git: https://salsa.debian.org/debian-gis-team/saga.git -b experimental
Homepage: http://www.saga-gis.org/
Package: saga
=====================================
debian/copyright
=====================================
@@ -6,75 +6,75 @@ Comment: Saga is generally licensed using two licenses:
LGPL-2.1+ for the libraries and GPL-2+ for the rest of the program.
Excluded files are non-free (triangle and firelib) or are already packaged
in debian (svm and dxflib).
-Files-Excluded: saga*/src/tools/grid/grid_gridding/nn/triangle.c
- saga*/src/tools/grid/grid_gridding/nn/triangle.h
- saga*/src/tools/simulation/sim_fire_spreading/fireLib.*
- saga*/src/tools/imagery/imagery_svm/svm/svm.cpp
- saga*/src/tools/imagery/imagery_svm/svm/svm.h
- saga*/src/tools/io/io_shapes_dxf/dxflib/*
+Files-Excluded: saga-gis/src/tools/grid/grid_gridding/nn/triangle.c
+ saga-gis/src/tools/grid/grid_gridding/nn/triangle.h
+ saga-gis/src/tools/simulation/sim_fire_spreading/fireLib.*
+ saga-gis/src/tools/imagery/imagery_svm/svm/svm.cpp
+ saga-gis/src/tools/imagery/imagery_svm/svm/svm.h
+ saga-gis/src/tools/io/io_shapes_dxf/dxflib/*
Files: *
Copyright: SAGA Development Team
License: GPL-2+
-Files: src/saga_core/saga_api/*
+Files: saga-gis/src/saga_core/saga_api/*
Copyright: 2005-2019, Olaf Conrad
License: LGPL-2.1+
-Files: src/saga_core/saga_api/mat_formula.cpp
+Files: saga-gis/src/saga_core/saga_api/mat_formula.cpp
Copyright: 2002, Andre Ringeler
1993-1998, Harald Helfgott
License: LGPL-2.1+
-Files: src/saga_core/saga_api/clipper.cpp
- src/saga_core/saga_api/clipper.hpp
+Files: saga-gis/src/saga_core/saga_api/clipper.cpp
+ saga-gis/src/saga_core/saga_api/clipper.hpp
Copyright: 2010-2014, Angus Johnson
License: BSL-1.0
-Files: src/saga_core/saga_api/nanoflann.hpp
+Files: saga-gis/src/saga_core/saga_api/nanoflann.hpp
Copyright: 2008-2009, David G. Lowe (lowe at cs.ubc.ca).
2008-2009, Marius Muja (mariusm at cs.ubc.ca).
2011-2016, Jose Luis Blanco (joseluisblancoc at gmail.com).
License: BSD-2-clause
-Files: src/saga_core/saga_cmd/*
+Files: saga-gis/src/saga_core/saga_cmd/*
Copyright: 2005, 2017, Olaf Conrad
License: GPL-2+
-Files: src/saga_core/saga_gdi/*
+Files: saga-gis/src/saga_core/saga_gdi/*
Copyright: 2008-2009, 2014, Olaf Conrad
License: GPL-2+
-Files: src/saga_core/saga_gdi/saga_gdi.cpp
+Files: saga-gis/src/saga_core/saga_gdi/saga_gdi.cpp
Copyright: 2009, Olaf Conrad
License: GPL-2
-Files: src/saga_core/saga_gui/*
+Files: saga-gis/src/saga_core/saga_gui/*
Copyright: 2005-2009, Olaf Conrad
License: GPL-2+
-Files: src/saga_core/saga_gui/data_source_files.cpp
- src/saga_core/saga_gui/data_source_files.h
+Files: saga-gis/src/saga_core/saga_gui/data_source_files.cpp
+ saga-gis/src/saga_core/saga_gui/data_source_files.h
Copyright: 2010, Sun Zhuo
License: GPL-2+
-Files: src/saga_core/saga_gui/res/org.saga-gis.saga-gui.appdata.xml
+Files: saga-gis/src/saga_core/saga_gui/res/org.saga-gis.saga-gui.appdata.xml
Copyright: 2018, SAGA Development Team
License: CC0-1.0
-Files: src/tools/climate/*
+Files: saga-gis/src/tools/climate/*
Copyright: 2011-2019, Olaf Conrad
License: GPL-2+
-Files: src/tools/contrib/contrib_perego/*
+Files: saga-gis/src/tools/contrib/contrib_perego/*
Copyright: Alessandro Perego
License: GPL-2
-Files: src/tools/db/*
+Files: saga-gis/src/tools/db/*
Copyright: 2004-2013, Olaf Conrad
License: GPL-2+
-Files: src/tools/db/db_odbc/otlv4.h
+Files: saga-gis/src/tools/db/db_odbc/otlv4.h
Copyright: 1996-2010, Sergei Kuchin <skuchin at gmail.com>
License: OpenBSD-License
This library is free software. Permission to use, copy, modify,
@@ -90,28 +90,28 @@ License: OpenBSD-License
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-Files: src/tools/docs/*
+Files: saga-gis/src/tools/docs/*
Copyright: 2005, Victor Olaya
2010, Olaf Conrad
License: GPL-2+
-Files: src/tools/docs/docs_html/doc_html.cpp
- src/tools/docs/docs_html/doc_html.h
- src/tools/docs/docs_html/doc_svg.cpp
- src/tools/docs/docs_html/doc_svg.h
- src/tools/docs/docs_pdf/doc_pdf.cpp
- src/tools/docs/docs_pdf/doc_pdf.h
+Files: saga-gis/src/tools/docs/docs_html/doc_html.cpp
+ saga-gis/src/tools/docs/docs_html/doc_html.h
+ saga-gis/src/tools/docs/docs_html/doc_svg.cpp
+ saga-gis/src/tools/docs/docs_html/doc_svg.h
+ saga-gis/src/tools/docs/docs_pdf/doc_pdf.cpp
+ saga-gis/src/tools/docs/docs_pdf/doc_pdf.h
Copyright: 2005, Victor Olaya
2005, Olaf Conrad
License: LGPL-2.1
-Files: src/tools/garden/*
+Files: saga-gis/src/tools/garden/*
Copyright: 2003-2018, Olaf Conrad
2006, Victor Olaya
2003, Andre Ringeler
License: GPL-2+
-Files: src/tools/grid/*
+Files: saga-gis/src/tools/grid/*
Copyright: 2003-2019, Olaf Conrad
2015, Johan Van de Wauw
2005-2014, Volker Wichmann
@@ -123,12 +123,12 @@ Copyright: 2003-2019, Olaf Conrad
2003, SAGA User Group Associaton
License: GPL-2+
-Files: src/tools/grid/grid_gridding/nn/*
- src/tools/grid/grid_spline/csa.*
+Files: saga-gis/src/tools/grid/grid_gridding/nn/*
+ saga-gis/src/tools/grid/grid_spline/csa.*
Copyright: 2000-2008, Pavel Sakov and CSIRO
License: BSD-2-clause
-Files: src/tools/imagery/*
+Files: saga-gis/src/tools/imagery/*
Copyright: 2003-2016, Olaf Conrad
2008, 2012-2013, Benjamin Bechtel
2013, HfT Stuttgart
@@ -136,8 +136,8 @@ Copyright: 2003-2016, Olaf Conrad
Victor Olaya
License: GPL-2+
-Files: src/tools/imagery/imagery_maxent/me.cpp
- src/tools/imagery/imagery_maxent/me.h
+Files: saga-gis/src/tools/imagery/imagery_maxent/me.cpp
+ saga-gis/src/tools/imagery/imagery_maxent/me.h
Copyright: 2003, Dekang Lin <lindek at cs.ualberta.ca>
License: maxent
Permission to use, copy, modify, and distribute this software for any
@@ -148,32 +148,32 @@ License: maxent
purpose is made. It is provided "as is" without express or implied
warranty.
-Files: src/tools/imagery/imagery_tools/landsat_toar_core.cpp
+Files: saga-gis/src/tools/imagery/imagery_tools/landsat_toar_core.cpp
Copyright: 2000-2005, Liam Girdwood
2006, E. Jorge Tizado
Comment: Contains code modified from libnova-0.12, grass
License: GPL-2+
-Files: src/tools/io/*
+Files: saga-gis/src/tools/io/*
Copyright: 2003-2018, Olaf Conrad
2009-2014, Volker Wichmann
Victor Olaya
License: GPL-2+
-Files: src/tools/io/io_esri_e00/e00compr/cpl_conv.c
- src/tools/io/io_esri_e00/e00compr/cpl_conv.h
- src/tools/io/io_esri_e00/e00compr/cpl_error.c
- src/tools/io/io_esri_e00/e00compr/cpl_error.h
- src/tools/io/io_esri_e00/e00compr/cpl_port.h
- src/tools/io/io_esri_e00/e00compr/cpl_vsi.h
- src/tools/io/io_esri_e00/e00compr/cpl_vsisimple.c
+Files: saga-gis/src/tools/io/io_esri_e00/e00compr/cpl_conv.c
+ saga-gis/src/tools/io/io_esri_e00/e00compr/cpl_conv.h
+ saga-gis/src/tools/io/io_esri_e00/e00compr/cpl_error.c
+ saga-gis/src/tools/io/io_esri_e00/e00compr/cpl_error.h
+ saga-gis/src/tools/io/io_esri_e00/e00compr/cpl_port.h
+ saga-gis/src/tools/io/io_esri_e00/e00compr/cpl_vsi.h
+ saga-gis/src/tools/io/io_esri_e00/e00compr/cpl_vsisimple.c
Copyright: 1998, Daniel Morissette
1998, Frank Warmerdam
License: Expat
-Files: src/tools/io/io_esri_e00/e00compr/e00compr.h
- src/tools/io/io_esri_e00/e00compr/e00read.c
- src/tools/io/io_esri_e00/e00compr/e00write.c
+Files: saga-gis/src/tools/io/io_esri_e00/e00compr/e00compr.h
+ saga-gis/src/tools/io/io_esri_e00/e00compr/e00read.c
+ saga-gis/src/tools/io/io_esri_e00/e00compr/e00write.c
Copyright: 1998-1999, Daniel Morissette
License: e00compr
All rights reserved. This software may be copied or reproduced, in
@@ -191,42 +191,42 @@ License: e00compr
profits or consequential damages, arising out of the use of the
Software.
-Files: src/tools/pointcloud/*
+Files: saga-gis/src/tools/pointcloud/*
Copyright: 2003-2009, Olaf Conrad
2012, Magnus Bremer
2009-2014, Volker Wichmann
Victor Olaya
License: GPL-2+
-Files: src/tools/projection/*
+Files: saga-gis/src/tools/projection/*
Copyright: 2003-2018, Olaf Conrad
License: GPL-2+
-Files: src/tools/shapes/*
+Files: saga-gis/src/tools/shapes/*
Copyright: 2003-2019, Olaf Conrad
2012-2016, Volker Wichmann
2007-2009, Johan Van de Wauw
2004-2005, Victor Olaya
License: GPL-2+
-Files: src/tools/shapes/shapes_tools/quadtree_structure.cpp
- src/tools/shapes/shapes_tools/quadtree_structure.h
+Files: saga-gis/src/tools/shapes/shapes_tools/quadtree_structure.cpp
+ saga-gis/src/tools/shapes/shapes_tools/quadtree_structure.h
Copyright: 2009, Olaf Conrad
License: LGPL-2.1
-Files: src/tools/simulation/*
+Files: saga-gis/src/tools/simulation/*
Copyright: 2002-2017, Olaf Conrad
2016, Volker Wichmann
2006-2008, Stefan Liersch
Victor Olaya
License: GPL-2+
-Files: src/tools/statistics/*
+Files: saga-gis/src/tools/statistics/*
Copyright: 2003-2016, Olaf Conrad
2009, Andre Ringeler
License: GPL-2+
-Files: src/tools/table/*
+Files: saga-gis/src/tools/table/*
Copyright: 2003-2019, Olaf Conrad
2013-2014, Volker Wichmann
2010, Jan Papmeier
@@ -235,7 +235,7 @@ Copyright: 2003-2019, Olaf Conrad
2003, Andre Ringeler
License: GPL-2+
-Files: src/tools/terrain_analysis/*
+Files: saga-gis/src/tools/terrain_analysis/*
Copyright: 2003-2019, Olaf Conrad
2012-2013, Andreas Günther
2003-2013, Volker Wichmann
@@ -244,7 +244,7 @@ Copyright: 2003-2019, Olaf Conrad
Victor Olaya
License: GPL-2+
-Files: src/tools/tin/*
+Files: saga-gis/src/tools/tin/*
Copyright: 2003-2011, Olaf Conrad
License: GPL-2+
=====================================
debian/gbp.conf
=====================================
@@ -6,7 +6,7 @@ upstream-branch = upstream
# The default name for the Debian branch is "master".
# Change it if the name is different (for instance, "debian/unstable").
-debian-branch = master
+debian-branch = experimental
# git-import-orig uses the following names for the upstream tags.
# Change the value if you are not using git-import-orig
=====================================
debian/patches/series
=====================================
@@ -1,2 +1,3 @@
fix-version-check.patch
dxflib_configure.patch
+spelling-errors.patch
=====================================
debian/patches/spelling-errors.patch
=====================================
@@ -4,11 +4,14 @@ Description: Fix spelling errors.
* limitiations -> limitations
* atttributes -> attributes
* allows to -> allows <verb>ing
+ * occured -> occurred
+ * minimun -> minimum
+ * maximun -> maximum
Author: Bas Couwenberg <sebastic at debian.org>
---- a/src/tools/climate/climate_tools/snow_cover.cpp
-+++ b/src/tools/climate/climate_tools/snow_cover.cpp
-@@ -78,7 +78,7 @@ CSnow_Cover::CSnow_Cover(void)
+--- a/saga-gis/src/tools/climate/climate_tools/snow_cover.cpp
++++ b/saga-gis/src/tools/climate/climate_tools/snow_cover.cpp
+@@ -69,7 +69,7 @@ CSnow_Cover::CSnow_Cover(void)
"will diminish accumulated snow successively until it is gone completely. "
"Simulation is done on a daily basis. If you supply the tool with "
"monthly averages, temperatures will be interpolated using a spline "
@@ -17,8 +20,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
"is done with respect to the monthly mean temperature, i.e. the higher "
"the temperature the more concentrated are precipitation events and vice "
"versa. "
---- a/src/tools/grid/grid_filter/Filter_Sieve.cpp
-+++ b/src/tools/grid/grid_filter/Filter_Sieve.cpp
+--- a/saga-gis/src/tools/grid/grid_filter/Filter_Sieve.cpp
++++ b/saga-gis/src/tools/grid/grid_filter/Filter_Sieve.cpp
@@ -78,7 +78,7 @@ CFilter_Sieve::CFilter_Sieve(void)
Set_Description (_TW(
"The 'Sieve Classes' tool counts the number of adjacent cells "
@@ -28,8 +31,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
"(sieved), i.e. they are set to no-data. "
));
---- a/src/tools/grid/grid_tools/Grid_Merge.cpp
-+++ b/src/tools/grid/grid_tools/Grid_Merge.cpp
+--- a/saga-gis/src/tools/grid/grid_tools/Grid_Merge.cpp
++++ b/saga-gis/src/tools/grid/grid_tools/Grid_Merge.cpp
@@ -75,7 +75,7 @@ CGrid_Merge::CGrid_Merge(void)
"example, would exceed the maximum command line length, the tools has "
"the option to provide a file list as input (instead of using the input "
@@ -39,8 +42,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
"is set automatically in this case (the extent is calculated from all "
"inputs and the cell size is set to the smallest one detected) and (ii) "
"the input grids must still fit into memory, i.e. are all loaded at once.\n\n"
---- a/src/tools/shapes/shapes_polygons/Polygon_Geometrics.cpp
-+++ b/src/tools/shapes/shapes_polygons/Polygon_Geometrics.cpp
+--- a/saga-gis/src/tools/shapes/shapes_polygons/Polygon_Geometrics.cpp
++++ b/saga-gis/src/tools/shapes/shapes_polygons/Polygon_Geometrics.cpp
@@ -45,7 +45,7 @@ CPolygon_Geometrics::CPolygon_Geometrics
Set_Author ("V.Olaya (c) 2004, O.Conrad (c) 2011");
@@ -50,8 +53,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
));
Parameters.Add_Shapes("",
---- a/src/tools/terrain_analysis/ta_slope_stability/TOBIA_01.cpp
-+++ b/src/tools/terrain_analysis/ta_slope_stability/TOBIA_01.cpp
+--- a/saga-gis/src/tools/terrain_analysis/ta_slope_stability/TOBIA_01.cpp
++++ b/saga-gis/src/tools/terrain_analysis/ta_slope_stability/TOBIA_01.cpp
@@ -79,7 +79,7 @@ CTOBIA::CTOBIA(void)
"\n"
"This tool computes both a continuous and a categorical TOBIA (""Topography Bedding Intersection Angle"") Index according to Meentemeyer & Moody (2000) "
@@ -61,20 +64,20 @@ Author: Bas Couwenberg <sebastic at debian.org>
"0) Underdip slope\n"
"1) Dip slope\n"
"2) Overdip slope\n"
---- a/src/saga_core/saga_api/mat_tools.cpp
-+++ b/src/saga_core/saga_api/mat_tools.cpp
-@@ -1968,7 +1968,7 @@ bool CSG_Cluster_Analysis::Set_Feature(i
- * climbing (= 1), or both methods in combination. If nMaxIterations
- * is set to zero, the analysis is iterated until it converges.
- * Initilization is done randomely (= default), periodically (= 1),
-- * or skipped (= 2). The latter case allows to start the clustering
-+ * or skipped (= 2). The latter case allows starting the clustering
- * with user supplied start partitions.
+--- a/saga-gis/src/saga_core/saga_api/mat_tools.cpp
++++ b/saga-gis/src/saga_core/saga_api/mat_tools.cpp
+@@ -2047,7 +2047,7 @@ bool CSG_Cluster_Analysis::Set_Feature(i
+ * climbing (= 1), or both methods in combination. If nMaxIterations
+ * is set to zero, the analysis is iterated until it converges.
+ * Initilization is done randomely (= default), periodically (= 1),
+-* or skipped (= 2). The latter case allows to start the clustering
++* or skipped (= 2). The latter case allows starting the clustering
+ * with user supplied start partitions.
*/
//---------------------------------------------------------
---- a/src/tools/grid/grid_tools/Grid_Combine_Classes.cpp
-+++ b/src/tools/grid/grid_tools/Grid_Combine_Classes.cpp
-@@ -74,7 +74,7 @@ CGrid_Combine_Classes::CGrid_Combine_Cla
+--- a/saga-gis/src/tools/grid/grid_tools/Grid_Combine_Classes.cpp
++++ b/saga-gis/src/tools/grid/grid_tools/Grid_Combine_Classes.cpp
+@@ -64,7 +64,7 @@ CGrid_Combine_Classes::CGrid_Combine_Cla
Set_Description (_TW(
"Based on the look-up table classfication of a grid, this tool "
@@ -83,8 +86,8 @@ Author: Bas Couwenberg <sebastic at debian.org>
));
//-----------------------------------------------------
---- a/src/tools/statistics/statistics_grid/grid_statistics_successive.cpp
-+++ b/src/tools/statistics/statistics_grid/grid_statistics_successive.cpp
+--- a/saga-gis/src/tools/statistics/statistics_grid/grid_statistics_successive.cpp
++++ b/saga-gis/src/tools/statistics/statistics_grid/grid_statistics_successive.cpp
@@ -219,7 +219,7 @@ CGrid_Statistics_Add::CGrid_Statistics_A
Set_Author ("O.Conrad (c) 2018");
@@ -94,3 +97,137 @@ Author: Bas Couwenberg <sebastic at debian.org>
"from grids by subsequent calls. "
"The targeted data sets, particularly the histogram, should have been created with "
"'Build Statistics for Grids' tool. The collected information can be used "
+--- a/saga-gis/src/tools/climate/climate_tools/temperature_lapse_rates.cpp
++++ b/saga-gis/src/tools/climate/climate_tools/temperature_lapse_rates.cpp
+@@ -64,7 +64,7 @@ CTemperature_Lapse_Rates::CTemperature_L
+
+ Set_Description (_TW(
+ "This tool selects daily temperature lapse rates for minimum and maximum temperatures "
+- "from hourly lapse rates by selecting the time at which minimum or maximum temperatures occured "
++ "from hourly lapse rates by selecting the time at which minimum or maximum temperatures occurred "
+ "and then returns the respective lapse rate."
+ ));
+
+--- a/saga-gis/src/tools/io/io_riegl_rdb/rapidjson/document.h
++++ b/saga-gis/src/tools/io/io_riegl_rdb/rapidjson/document.h
+@@ -2280,7 +2280,7 @@ public:
+ //!@name Handling parse errors
+ //!@{
+
+- //! Whether a parse error has occured in the last parsing.
++ //! Whether a parse error has occurred in the last parsing.
+ bool HasParseError() const { return parseResult_.IsError(); }
+
+ //! Get the \ref ParseErrorCode of last parsing.
+--- a/saga-gis/src/tools/io/io_riegl_rdb/rapidjson/reader.h
++++ b/saga-gis/src/tools/io/io_riegl_rdb/rapidjson/reader.h
+@@ -527,7 +527,7 @@ public:
+ return Parse<kParseDefaultFlags>(is, handler);
+ }
+
+- //! Whether a parse error has occured in the last parsing.
++ //! Whether a parse error has occurred in the last parsing.
+ bool HasParseError() const { return parseResult_.IsError(); }
+
+ //! Get the \ref ParseErrorCode of last parsing.
+--- a/saga-gis/src/tools/projection/pj_geotrans/geotrans/ellipse.c
++++ b/saga-gis/src/tools/projection/pj_geotrans/geotrans/ellipse.c
+@@ -35,7 +35,7 @@
+ * the bitwise or. This combining allows multiple error codes to be
+ * returned. The possible error codes are:
+ *
+- * ELLIPSE_NO_ERROR : No errors occured in function
++ * ELLIPSE_NO_ERROR : No errors occurred in function
+ * ELLIPSE_FILE_OPEN_ERROR : Ellipsoid file opening error
+ * ELLIPSE_INITIALIZE_ERROR : Ellipsoid table can not initialize
+ * ELLIPSE_TABLE_OVERFLOW_ERROR : Ellipsoid table overflow
+--- a/saga-gis/src/tools/projection/pj_geotrans/geotrans/ellipse.h
++++ b/saga-gis/src/tools/projection/pj_geotrans/geotrans/ellipse.h
+@@ -38,7 +38,7 @@
+ * the bitwise or. This combining allows multiple error codes to be
+ * returned. The possible error codes are:
+ *
+- * ELLIPSE_NO_ERROR : No errors occured in function
++ * ELLIPSE_NO_ERROR : No errors occurred in function
+ * ELLIPSE_FILE_OPEN_ERROR : Ellipsoid file opening error
+ * ELLIPSE_INITIALIZE_ERROR : Ellipsoid database can not initialize
+ * ELLIPSE_TABLE_OVERFLOW_ERROR : Ellipsoid table overflow
+--- a/saga-gis/src/tools/projection/pj_geotrans/geotrans/geoid.c
++++ b/saga-gis/src/tools/projection/pj_geotrans/geotrans/geoid.c
+@@ -16,7 +16,7 @@
+ * the bitwise or. This combining allows multiple error codes to be
+ * returned. The possible error codes are:
+ *
+- * GEOID_NO_ERROR : No errors occured in function
++ * GEOID_NO_ERROR : No errors occurred in function
+ * GEOID_FILE_OPEN_ERROR : Geoid file opening error
+ * GEOID_INITIALIZE_ERROR : Geoid seoaration database can not initialize
+ * GEOID_LAT_ERROR : Latitude out of valid range
+--- a/saga-gis/src/tools/projection/pj_geotrans/geotrans/geoid.h
++++ b/saga-gis/src/tools/projection/pj_geotrans/geotrans/geoid.h
+@@ -20,7 +20,7 @@
+ * the bitwise or. This combining allows multiple error codes to be
+ * returned. The possible error codes are:
+ *
+- * GEOID_NO_ERROR : No errors occured in function
++ * GEOID_NO_ERROR : No errors occurred in function
+ * GEOID_FILE_OPEN_ERROR : Geoid file opening error
+ * GEOID_INITIALIZE_ERROR : Geoid seoaration database can not initialize
+ * GEOID_NOT_INITIALIZED_ERROR : Geoid separation database not initialized properly
+--- a/saga-gis/src/tools/shapes/shapes_points/points_thinning.cpp
++++ b/saga-gis/src/tools/shapes/shapes_points/points_thinning.cpp
+@@ -198,8 +198,8 @@ bool CPoints_Thinning::On_Execute(void)
+
+ m_pThinned->Add_Field("Count" , SG_DATATYPE_Int );
+ m_pThinned->Add_Field("Mean" , SG_DATATYPE_Double);
+- m_pThinned->Add_Field("Minimun", SG_DATATYPE_Double);
+- m_pThinned->Add_Field("Maximun", SG_DATATYPE_Double);
++ m_pThinned->Add_Field("Minimum", SG_DATATYPE_Double);
++ m_pThinned->Add_Field("Maximum", SG_DATATYPE_Double);
+ m_pThinned->Add_Field("StdDev" , SG_DATATYPE_Double);
+
+ //-----------------------------------------------------
+@@ -356,8 +356,8 @@ inline void CPoints_Thinning::QuadTree_A
+ Add_Point(pLeaf->Get_X(), pLeaf->Get_Y(),
+ (int)pList->Get_Count (), // Count
+ pList->Get_Mean (), // Mean
+- pList->Get_Minimum(), // Minimun
+- pList->Get_Maximum(), // Maximun
++ pList->Get_Minimum(), // Minimum
++ pList->Get_Maximum(), // Maximum
+ pList->Get_StdDev () // StdDev
+ );
+ }
+@@ -366,8 +366,8 @@ inline void CPoints_Thinning::QuadTree_A
+ Add_Point(pLeaf->Get_X(), pLeaf->Get_Y(),
+ 1 , // Count
+ pLeaf->Get_Z(), // Mean
+- pLeaf->Get_Z(), // Minimun
+- pLeaf->Get_Z(), // Maximun
++ pLeaf->Get_Z(), // Minimum
++ pLeaf->Get_Z(), // Maximum
+ 0. // StdDev
+ );
+ }
+@@ -379,8 +379,8 @@ inline void CPoints_Thinning::QuadTree_A
+ Add_Point(pNode->Get_X()->Get_Mean(), pNode->Get_Y()->Get_Mean(),
+ (int)pNode->Get_Z()->Get_Count (), // Count
+ pNode->Get_Z()->Get_Mean (), // Mean
+- pNode->Get_Z()->Get_Minimum(), // Minimun
+- pNode->Get_Z()->Get_Maximum(), // Maximun
++ pNode->Get_Z()->Get_Minimum(), // Minimum
++ pNode->Get_Z()->Get_Maximum(), // Maximum
+ pNode->Get_Z()->Get_StdDev () // StdDev
+ );
+ }
+--- a/saga-gis/src/tools/shapes/shapes_points/remove_duplicates.cpp
++++ b/saga-gis/src/tools/shapes/shapes_points/remove_duplicates.cpp
+@@ -289,7 +289,7 @@ void CRemove_Duplicates::Set_Attributes(
+
+ switch( m_Numeric )
+ {
+- case 1: pPoint->Set_Value(iField, s.Get_Minimum()); break; // minimun value
++ case 1: pPoint->Set_Value(iField, s.Get_Minimum()); break; // minimum value
+ case 2: pPoint->Set_Value(iField, s.Get_Maximum()); break; // maximum value
+ case 3: pPoint->Set_Value(iField, s.Get_Mean ()); break; // mean value
+ }
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/19a8181a7edd56089b7352436bbdb16e27a0b4aa...8f065c97a18de0952ba89834820d2f24e10388db
--
View it on GitLab: https://salsa.debian.org/debian-gis-team/saga/-/compare/19a8181a7edd56089b7352436bbdb16e27a0b4aa...8f065c97a18de0952ba89834820d2f24e10388db
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-grass-devel/attachments/20211216/eb7edad0/attachment-0001.htm>
More information about the Pkg-grass-devel
mailing list