This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository saga.
commit de6ad2705bd8747a94e1694776a4fff20a725c73 Author: Bas Couwenberg <[email protected]> Date: Fri Mar 4 19:15:55 2016 +0100 Add patch to fix various spelling errors. --- debian/changelog | 1 + debian/patches/series | 1 + debian/patches/spelling-errors.patch | 346 +++++++++++++++++++++++++++++++++++ debian/saga.lintian-overrides | 6 + 4 files changed, 354 insertions(+) diff --git a/debian/changelog b/debian/changelog index 810c50b..aeb39d2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ saga (2.2.5+dfsg-1) UNRELEASED; urgency=medium * Install application icon in hicolor theme. * Add patch to disable gridding module, FTBFS with --disable-triangle. * Add patch for to add Keywords to desktop file. + * Add patch to fix various spelling errors. -- Johan Van de Wauw <Johan Van de Wauw [email protected]> Fri, 04 Mar 2016 17:34:50 +0100 diff --git a/debian/patches/series b/debian/patches/series index 86aff5f..187a3fe 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0001-vigra-hdf5-include.patch disable-grid-gridding.patch desktop-keywords.patch +spelling-errors.patch diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch new file mode 100644 index 0000000..6c68886 --- /dev/null +++ b/debian/patches/spelling-errors.patch @@ -0,0 +1,346 @@ +Description: Fix various spelling errors. + decribes -> describes + splitted -> split + allows to <verb> -> allows <verb>ing +Author: Bas Couwenberg <[email protected]> +Forwarded: https://sourceforge.net/p/saga-gis/bugs/220/ + +--- a/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.cpp ++++ b/src/modules/io/io_virtual/pc_remove_overlap_from_spcvf.cpp +@@ -79,11 +79,11 @@ CPointCloud_Remove_Overlap_From_SPCVF::C + Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014")); + + Set_Description (_TW( +- "The module allows to remove the overlap from point cloud " ++ "The module allows removing the overlap from point cloud " + "tiles created from a virtual point cloud dataset. The " + "tiles must have been created with an overlap and a spcvf " + "tile info file must have been outputted too. The latter " +- "decribes the original bounding boxes of the tiles (i.e. " ++ "describes the original bounding boxes of the tiles (i.e. " + "without overlap) and is used by this module to remove " + "the overlap.\n" + "A virtual point cloud dataset is a simple XML format " +--- a/src/modules/io/io_gdal/gdal_catalogue.cpp ++++ b/src/modules/io/io_gdal/gdal_catalogue.cpp +@@ -226,7 +226,7 @@ CGDAL_Catalogues::CGDAL_Catalogues(void) + + Description = _TW( + "Creates raster catalogues from all raster files found in the selected directory. " +- "Catalogues are splitted according to the coordinate reference system used by the " ++ "Catalogues are split according to the coordinate reference system used by the " + "different raster files. Output are polygon layers that show the extent for each " + "raster file in it. Each extent is attributed with the original file path and " + "raster system properties.\n" +--- a/src/modules/shapes/shapes_lines/line_split_with_lines.cpp ++++ b/src/modules/shapes/shapes_lines/line_split_with_lines.cpp +@@ -134,7 +134,7 @@ bool CLine_Split_with_Lines::On_Execute( + + //-------------------------------------------------------- + pIntersect->Create(SHAPE_TYPE_Line, +- CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Splitted"), pSplit->Get_Name()), ++ CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Split"), pSplit->Get_Name()), + pLines + ); + +@@ -304,7 +304,7 @@ bool CLine_Split_at_Points::On_Execute(v + + //-------------------------------------------------------- + pIntersect->Create(SHAPE_TYPE_Line, +- CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Splitted"), pSplit->Get_Name()), ++ CSG_String::Format(SG_T("%s [%s: %s]"), pLines->Get_Name(), _TL("Split"), pSplit->Get_Name()), + pLines + ); + +--- a/src/modules/terrain_analysis/ta_profiles/Grid_Profile_From_Lines.cpp ++++ b/src/modules/terrain_analysis/ta_profiles/Grid_Profile_From_Lines.cpp +@@ -103,7 +103,7 @@ CGrid_Profile_From_Lines::CGrid_Profile_ + + Parameters.Add_Table_Field( + pNode , "NAME" , _TL("Name"), +- _TL("naming for splitted lines"), ++ _TL("naming for split lines"), + true + ); + +--- a/src/saga_core/saga_gui/res/saga.bra.txt ++++ b/src/saga_core/saga_gui/res/saga.bra.txt +@@ -406,8 +406,8 @@ TEXT TRANSLATION + "Allow longitudes outside -180 to 180 Range" "Permitir longitudes fora do alcance 180 a 180" + "Allow multiple observer positions." "Permitir v�rias posi��es de observa��o." + "Allows one to scale shade brightness [%]" "Permite escala de brilho de sombra [%]" +-"Allows to scale shade brightness, [percent]" "Permite escala de brilho de sombra, [porcento]" +-"Allows to write cell values from additional grids to the output" "Permite escrever valores de c�lulas de grades adicionais para a sa�da" ++"Allows scaling shade brightness, [percent]" "Permite escala de brilho de sombra, [porcento]" ++"Allows writing cell values from additional grids to the output" "Permite escrever valores de c�lulas de grades adicionais para a sa�da" + "Alpha" "Alfa" + "Alpha Max (Degree)" "Alfa m�ximo (Graus)" + "Altura de llama" "Altura de lhama" +@@ -4679,7 +4679,7 @@ TEXT TRANSLATION + "Split Shapes Layer Randomly" "Dividir camada Shapes aleatoriamente" + "Split Table/Shapes by Attribute" "Dividir tabela/shapes por atributo" + "Split with Line" "Dividir com a linha" +-"Splitted" "Dividido" ++"Split" "Dividido" + "Spring" "Primavera" + "Spur" "Espor�o" + "Square" "Quadrado" +@@ -5038,7 +5038,7 @@ TEXT TRANSLATION + "The smoothing preservation factor [-]." "Factor de preserva��o de alisamento [-]." + "The start value to use for the identifier." "Valor inicial a ser usado para o identificador." + "The table with the (numeric) data values for each class. The module creates a grid for each table column (besides the ID)." "Tabela com os valores (num�ricos) de dados para cada classe. O m�dulo cria uma grade para cada coluna da tabela (al�m da ID)." +-"The terrain exaggeration factor allows to increase the shading contrasts in flat areas." "O fator exagero de terreno permite aumentar os contrastes de sombra em �reas planas." ++"The terrain exaggeration factor allows increasing the shading contrasts in flat areas." "O fator exagero de terreno permite aumentar os contrastes de sombra em �reas planas." + "The transmittance of the atmosphere, usually between 60 and 80 percent." "Transmit�ncia da atmosfera, geralmente entre 60 e 80 por cento." + "The transparency of the shade [%]" "Transpar�ncia da sombra[%]" + "The unobstructed hemisphere given as percentage." "Hemisf�rio desobstru�do dado em percentagem." +@@ -6483,7 +6483,7 @@ TEXT TRANSLATION + "n" "n" + "n-fold cross validation: n must > 1" "valida��o cruzada n-fold: n preciso > 1" + "name" "nome" +-"naming for splitted lines" "nomea��o para linhas parceladas" ++"naming for split lines" "nomea��o para linhas parceladas" + "nearest neighbour" "vizinho mais pr�ximo" + "needs at least two attributes in selection" "precisa de pelo menos dois atributos na sele��o" + "nein" "nein" +--- a/src/saga_core/saga_gui/res/saga.ger.txt ++++ b/src/saga_core/saga_gui/res/saga.ger.txt +@@ -406,8 +406,8 @@ TEXT TRANSLATION + "Allow longitudes outside -180 to 180 Range" "Ber�cksichtige L�ngen au�erhalb -180 bis 180 Bereich" + "Allow multiple observer positions." "" + "Allows one to scale shade brightness [%]" "" +-"Allows to scale shade brightness, [percent]" "" +-"Allows to write cell values from additional grids to the output" "Ber�cksichtige Zellwerte zus�tzlicher Rasterdateien bei der Ausgabe" ++"Allows scaling shade brightness, [percent]" "" ++"Allows writing cell values from additional grids to the output" "Ber�cksichtige Zellwerte zus�tzlicher Rasterdateien bei der Ausgabe" + "Alpha" "" + "Alpha Max (Degree)" "Alpha Max (Grad)" + "Altura de llama" "" +@@ -4679,7 +4679,7 @@ TEXT TRANSLATION + "Split Shapes Layer Randomly" "Vektorebene zuf�llig aufteilen" + "Split Table/Shapes by Attribute" "Teile Tabelle/Vektoren durch Attribut" + "Split with Line" "" +-"Splitted" "" ++"Split" "" + "Spring" "" + "Spur" "" + "Square" "Rechteck" +@@ -5038,7 +5038,7 @@ TEXT TRANSLATION + "The smoothing preservation factor [-]." "" + "The start value to use for the identifier." "" + "The table with the (numeric) data values for each class. The module creates a grid for each table column (besides the ID)." "" +-"The terrain exaggeration factor allows to increase the shading contrasts in flat areas." "Der Relief�berh�hungsfaktor erlaubt das Anheben der Schattenkontraste in flachen Fl�chen." ++"The terrain exaggeration factor allows increasing the shading contrasts in flat areas." "Der Relief�berh�hungsfaktor erlaubt das Anheben der Schattenkontraste in flachen Fl�chen." + "The transmittance of the atmosphere, usually between 60 and 80 percent." "Der Durchl�ssigkeitswert der Atmosph�re, gew�hnlich zwischen 60 und 80 Prozent." + "The transparency of the shade [%]" "" + "The unobstructed hemisphere given as percentage." "Die unversperrte Hemisph�re beschrieben in Prozent." +@@ -6483,7 +6483,7 @@ TEXT TRANSLATION + "n" "" + "n-fold cross validation: n must > 1" "" + "name" "Name" +-"naming for splitted lines" "Namensgebung f�r getrennte Linien" ++"naming for split lines" "Namensgebung f�r getrennte Linien" + "nearest neighbour" "" + "needs at least two attributes in selection" "" + "nein" "" +--- a/src/saga_core/saga_gui/res/saga.lng.txt ++++ b/src/saga_core/saga_gui/res/saga.lng.txt +@@ -406,8 +406,8 @@ TEXT TRANSLATION + "Allow longitudes outside -180 to 180 Range" "" + "Allow multiple observer positions." "" + "Allows one to scale shade brightness [%]" "" +-"Allows to scale shade brightness, [percent]" "" +-"Allows to write cell values from additional grids to the output" "" ++"Allows scaling shade brightness, [percent]" "" ++"Allows writing cell values from additional grids to the output" "" + "Alpha" "" + "Alpha Max (Degree)" "" + "Altura de llama" "" +@@ -4679,7 +4679,7 @@ TEXT TRANSLATION + "Split Shapes Layer Randomly" "" + "Split Table/Shapes by Attribute" "" + "Split with Line" "" +-"Splitted" "" ++"Split" "" + "Spring" "" + "Spur" "" + "Square" "" +@@ -5038,7 +5038,7 @@ TEXT TRANSLATION + "The smoothing preservation factor [-]." "" + "The start value to use for the identifier." "" + "The table with the (numeric) data values for each class. The module creates a grid for each table column (besides the ID)." "" +-"The terrain exaggeration factor allows to increase the shading contrasts in flat areas." "" ++"The terrain exaggeration factor allows increasing the shading contrasts in flat areas." "" + "The transmittance of the atmosphere, usually between 60 and 80 percent." "" + "The transparency of the shade [%]" "" + "The unobstructed hemisphere given as percentage." "" +@@ -6483,7 +6483,7 @@ TEXT TRANSLATION + "n" "" + "n-fold cross validation: n must > 1" "" + "name" "" +-"naming for splitted lines" "" ++"naming for split lines" "" + "nearest neighbour" "" + "needs at least two attributes in selection" "" + "nein" "" +--- a/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp ++++ b/src/modules/grid/grid_analysis/LeastCostPathProfile_Points.cpp +@@ -109,7 +109,7 @@ CLeastCostPathProfile_Points::CLeastCost + + Parameters.Add_Grid_List( + NULL , "VALUES" , _TL("Values"), +- _TL("Allows to write cell values from additional grids to the output"), ++ _TL("Allows writing cell values from additional grids to the output"), + PARAMETER_INPUT_OPTIONAL + ); + +--- a/src/modules/grid/grid_gridding/nn/nn.h ++++ b/src/modules/grid/grid_gridding/nn/nn.h +@@ -232,7 +232,7 @@ void nnpi_setwmin(nnpi* nn, double wmin) + /** `nnhpi' -- "Natural Neighbours Hashing Point Interpolator" -- is a + ** structure for conducting consequitive Natural Neighbours interpolations + ** from the same set of observation points, designed to take advantage of +- ** repeated interpolations in the same point. It allows to modify Z ++ ** repeated interpolations in the same point. It allows modifying Z + ** coordinate of observed data between interpolations (because this does not + ** affect the interpolant weights). + */ +@@ -283,7 +283,7 @@ void nnhpi_setwmin(nnhpi* nn, double wmi + + /** `nnai' -- "Natural Neighbours Array Interpolator" is a structure for + ** conducting consequitive Natural Neighbours interpolations from the same +- ** set of observation points in the same set of points. It allows to modify Z ++ ** set of observation points in the same set of points. It allows modifying Z + ** coordinate of data between interpolations (because this does not + ** affect the interpolant weights). + * +--- a/src/modules/grid/grid_gridding/nn/nncommon.c ++++ b/src/modules/grid/grid_gridding/nn/nncommon.c +@@ -13,7 +13,7 @@ + * + * Revisions: 15/11/2002 PS: Changed name from "utils.c" + * 28/02/2003 PS: Modified points_read() to do the job without +- * rewinding the file. This allows to read from stdin when ++ * rewinding the file. This allows reading from stdin when + * necessary. + * 09/04/2003 PS: Modified points_read() to read from a + * file specified by name, not by handle. +--- a/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp ++++ b/src/modules/grid/grid_tools/Grid_Value_Replace_Interactive.cpp +@@ -45,7 +45,7 @@ CGrid_Value_Replace_Interactive::CGrid_V + Set_Author ("Victor Olaya (c) 2004"); + + Set_Description (_TW( +- "The module allows to interactively change cell values of the input grid. " ++ "The module allows interactively changing cell values of the input grid. " + "Once the module is executed and running, you can use the Action tool to select " + "grid cells. While working on a grid, you can change (and apply) the 'New Value' " + "and the 'Method' parameters without stopping and re-starting the module.\n" +--- a/src/modules/io/io_esri_e00/e00compr/e00read.c ++++ b/src/modules/io/io_esri_e00/e00compr/e00read.c +@@ -247,7 +247,7 @@ void E00ReadClose(E00ReadPtr psInfo) + /********************************************************************** + * E00ReadRewind() + * +- * Rewind the E00ReadPtr. Allows to start another read pass on the ++ * Rewind the E00ReadPtr. Allows starting another read pass on the + * input file. + **********************************************************************/ + void E00ReadRewind(E00ReadPtr psInfo) +--- a/src/modules/io/io_grid_image/grid_to_kml.cpp ++++ b/src/modules/io/io_grid_image/grid_to_kml.cpp +@@ -208,7 +208,7 @@ CGrid_to_KML::CGrid_to_KML(void) + { + Parameters.Add_Range( + NULL , "SHADE_BRIGHT", _TL("Shade Brightness"), +- _TL("Allows to scale shade brightness, [percent]"), ++ _TL("Allows scaling shade brightness, [percent]"), + 0.0, 100.0, 0.0, true, 100.0, true + ); + } +--- a/src/modules/io/io_shapes/pointcloud_to_text_file.cpp ++++ b/src/modules/io/io_shapes/pointcloud_to_text_file.cpp +@@ -83,7 +83,7 @@ CPointcloud_To_Text_File::CPointcloud_To + + Set_Description (_TW( + "Exports a point cloud to a text file. Once the module is executed, " +- "a pop-up dialog allows to specify the fields to be exported and their " ++ "a pop-up dialog allows specifying the fields to be exported and their " + "decimal precision.\n\n" + "Module usage is different between SAGA GUI and SAGA CMD: With " + "SAGA GUI you will get prompted to choose the fields to export " +--- a/src/modules/io/io_shapes_las/las_export.cpp ++++ b/src/modules/io/io_shapes_las/las_export.cpp +@@ -95,7 +95,7 @@ CLAS_Export::CLAS_Export(void) + + CSG_String Description(_TW( + "This module exports a SAGA Point Cloud as ASPRS LAS file (version 1.2) " +- "using the \"libLAS\" library. It allows to write Point Data Record Formats 1 to 4. " ++ "using the \"libLAS\" library. It allows writing Point Data Record Formats 1 to 4. " + "Please have a look at the <a href=\"http://www.asprs.org/society/committees/standards/lidar_exchange_format.html\""; + ">ASPRS LAS 1.2 Format Specification</a> for " + "more information on the attributes supported with each format.\n" +--- a/src/modules/io/io_virtual/pc_get_subset_spcvf.cpp ++++ b/src/modules/io/io_virtual/pc_get_subset_spcvf.cpp +@@ -584,7 +584,7 @@ CPointCloud_Get_Subset_SPCVF::CPointClou + Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014")); + + Set_Description (_TW( +- "The module allows to retrieve a point cloud from a virtual " ++ "The module allows retrieving a point cloud from a virtual " + "point cloud dataset by applying the provided area-of-interest " + "(AOI). The extent of the AOI can be provided either as polygon " + "shapefile, grid or by coordinates. Optionally, an overlap can " +@@ -892,7 +892,7 @@ CPointCloud_Get_Subset_SPCVF_Interactive + Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014")); + + Set_Description (_TW( +- "The module allows to retrieve a point cloud from a virtual " ++ "The module allows retrieving a point cloud from a virtual " + "point cloud dataset by dragging a box (AOI) in a Map View.\n" + "Optionally, the query can be constrained by providing an " + "attribute field and a value range that must be met.\n" +--- a/src/modules/io/io_virtual/pc_tileshape_from_spcvf.cpp ++++ b/src/modules/io/io_virtual/pc_tileshape_from_spcvf.cpp +@@ -79,7 +79,7 @@ CPointCloud_Create_Tileshape_From_SPCVF: + Set_Author (SG_T("V. Wichmann, LASERDATA GmbH (c) 2014")); + + Set_Description (_TW( +- "The module allows to create a polygon shapefile with the " ++ "The module allows creating a polygon shapefile with the " + "bounding boxes of a virtual point cloud dataset. Additionally, " + "the header information of the chosen virtual point cloud " + "dataset is reported (since SPCVFDataset version 1.1).\n" +--- a/src/modules/terrain_analysis/ta_lighting/HillShade.cpp ++++ b/src/modules/terrain_analysis/ta_lighting/HillShade.cpp +@@ -129,7 +129,7 @@ CHillShade::CHillShade(void) + + Parameters.Add_Value( + NULL , "EXAGGERATION" , _TL("Exaggeration"), +- _TL("The terrain exaggeration factor allows to increase the shading contrasts in flat areas."), ++ _TL("The terrain exaggeration factor allows increasing the shading contrasts in flat areas."), + PARAMETER_TYPE_Double , 4 + ); + +--- a/src/modules/terrain_analysis/ta_preprocessor/Pit_Eliminator.cpp ++++ b/src/modules/terrain_analysis/ta_preprocessor/Pit_Eliminator.cpp +@@ -118,7 +118,7 @@ CPit_Eliminator::CPit_Eliminator(void) + Parameters.Add_Value( + NULL , "THRSHEIGHT" , _TL("Threshold Height"), + _TW("The parameter describes the maximum depth of a sink to be considered for removal [map units]. " +- "This allows to exclude deeper sinks from filling."), ++ "This allows excluding deeper sinks from filling."), + PARAMETER_TYPE_Double , 100 + ); + } +--- a/src/scripting/python/helpers/saga_cmd_param_interface/param_interface.py ++++ b/src/scripting/python/helpers/saga_cmd_param_interface/param_interface.py +@@ -10,7 +10,7 @@ + # purpose: + # generate a simple text-based description of the saga_cmd parameter + # interface of a SAGA binary installation. +-# this allows to detect changes in the parameter interface of different ++# this allows detecting changes in the parameter interface of different + # SAGA versions. + # + # usage: diff --git a/debian/saga.lintian-overrides b/debian/saga.lintian-overrides index 432ab48..a5d3afb 100644 --- a/debian/saga.lintian-overrides +++ b/debian/saga.lintian-overrides @@ -5,3 +5,9 @@ saga: spelling-error-in-binary * Programms Programs # Fortify Source functions: no, only unprotected functions found! saga: hardening-no-fortify-functions * +# False positive on LGPL-2.1 text: +# [This is the first released version of the Lesser GPL. It also counts +# as the successor of the GNU Library Public License, version 2, hence +# the version number 2.1.] +saga: spelling-error-in-binary usr/bin/saga_gui GNU Library Public License GNU Library General Public License + -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/saga.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
