This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository otb.
commit 6dd3e0c5f223dbe67129d316da5b1d0e709ff5ef Author: Bas Couwenberg <[email protected]> Date: Sat Oct 28 10:14:29 2017 +0200 Drop spelling-errors.patch, applied upstream. --- debian/changelog | 1 + debian/patches/series | 1 - debian/patches/spelling-errors.patch | 116 ----------------------------------- 3 files changed, 1 insertion(+), 117 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8d9812b..8136d8c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ otb (6.2.0+dfsg-1) UNRELEASED; urgency=medium * Team upload. * New upstream release. + * Drop spelling-errors.patch, applied upstream. -- Bas Couwenberg <[email protected]> Sat, 28 Oct 2017 10:13:41 +0200 diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 38edaa7..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -spelling-errors.patch diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch deleted file mode 100644 index 9a595ca..0000000 --- a/debian/patches/spelling-errors.patch +++ /dev/null @@ -1,116 +0,0 @@ -Description: Fix spelling errors. - * allows to -> allows <verb>ing -Author: Bas Couwenberg <[email protected]> -Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1459 -Applied-Upstream: https://git.orfeo-toolbox.org/otb.git/commit/dd88866a4a072102577b591f226d227d77230c89 - ---- a/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx -+++ b/Modules/Applications/AppHyperspectral/app/otbHyperspectralUnmixing.cxx -@@ -103,7 +103,7 @@ private: - "spectrum associated with each pixel is a linear combination of pure" - "materials in the recovery area, commonly known as endmembers. Endmembers can" - "be estimated using the VertexComponentAnalysis application.\n\n" -- "The application allows to estimate the abundance maps with several algorithms :\n" -+ "The application allows estimating the abundance maps with several algorithms :\n" - " * Unconstrained Least Square (ucls)\n" - //" * Fully Constrained Least Square (fcls)\n" - " * Image Space Reconstruction Algorithm (isra)\n" ---- a/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx -+++ b/Modules/Applications/AppMathParserX/app/otbBandMathX.cxx -@@ -74,7 +74,7 @@ private: - "The list of features and the syntax of muParserX is available at [1].\n\n" - - "As opposed to muParser (and thus the BandMath OTB-application [2]), " -- "muParserX supports vector expressions which allows to output multi-band " -+ "muParserX supports vector expressions which allows outputting multi-band " - "images.\n\n" - - "Hereafter is a brief reference of the muParserX syntax\n\n" ---- a/Modules/Applications/AppStereo/app/otbBlockMatching.cxx -+++ b/Modules/Applications/AppStereo/app/otbBlockMatching.cxx -@@ -141,7 +141,7 @@ private: - "The application searches locally for the displacement between a reference" - " image and a secondary image. The correspondence is evaluated for each " - "pixel, based on a pair of local neighborhood windows. The displacement " -- "evaluated can be 1D (along lines) or 2D. Parameters allows to set the " -+ "evaluated can be 1D (along lines) or 2D. Parameters allow setting the " - "minimum and maximum disparities to search (both for horizontal and " - "vertical directions). A winner-take-all approach is used to select the " - "best match. There are different metrics implemented to evaluate the " ---- a/Modules/Visualization/MonteverdiGui/include/mvdImageViewWidget.h -+++ b/Modules/Visualization/MonteverdiGui/include/mvdImageViewWidget.h -@@ -163,7 +163,7 @@ public: - void SetPickingEnabled( bool ); - - /** -- * This allows to set the fallback behaviour for picking -+ * This allows setting the fallback behaviour for picking - */ - void SetPickingDefaultStatus( bool ); - /** ---- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperCompositeApplication.h -+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperCompositeApplication.h -@@ -32,7 +32,7 @@ namespace Wrapper - /** \class CompositeApplication - * \brief This class is a base class for composite applications - * -- * This class allows to create & store internal applications with the same logic -+ * This class allows creating & storing internal applications with the same logic - * as parameters. You choose the application type to create, you choose an - * identifier (alphanumeric string), and you can give a short description. - * Later, you will refer to this application using the identifier. In the ---- a/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h -+++ b/Modules/Wrappers/ApplicationEngine/include/otbWrapperProxyParameter.h -@@ -35,7 +35,7 @@ namespace Wrapper - * \brief Parameter class acting as a proxy to a different parameter - * - * The target parameter of this proxy is defined as a pair of a group parameter -- * containing the target and the targets key. It allows to define proxies on -+ * containing the target and the targets key. It allows defining proxies on - * parameters that may be themselves replaced by a proxy - * - * \ingroup OTBApplicationEngine ---- a/Packaging/makeself/README.md -+++ b/Packaging/makeself/README.md -@@ -128,7 +128,7 @@ Archives generated with Makeself can be - - * _--keep_ : Prevent the files to be extracted in a temporary directory that will be removed after the embedded script's execution. The files will then be extracted in the current working directory and will stay here until you remove them. - * _--verbose_ : Will prompt the user before executing the embedded command -- * _--target dir_ : Allows to extract the archive in an arbitrary place. -+ * _--target dir_ : Allows extracting the archive in an arbitrary place. - * _--nox11_ : Do not spawn a X11 terminal. - * _--confirm_ : Prompt the user for confirmation before running the embedded command. - * _--info_ : Print out general information about the archive (does not extract). ---- a/Modules/Visualization/MonteverdiGui/include/mvdProjectionBarWidget.h -+++ b/Modules/Visualization/MonteverdiGui/include/mvdProjectionBarWidget.h -@@ -69,7 +69,7 @@ class ProjectionBarWidget; - * \ingroup OTBMonteverdiGUI - * \brief ProjectionBarWidget widget class. - * -- * This Widget allow to change the zoom level of the current selected projection. -+ * This Widget allows changing the zoom level of the current selected projection. - */ - class OTBMonteverdiGUI_EXPORT ProjectionBarWidget : public QWidget - { ---- a/Packaging/CMakeLists.txt -+++ b/Packaging/CMakeLists.txt -@@ -63,7 +63,7 @@ find_program(ZIP_EXECUTABLE NAMES 7z 7za - set(CMAKE_INSTALL_PREFIX "${SUPERBUILD_INSTALL_DIR}") - - #set CMAKE_MODULE_PATH to be the current source directory. --# This will allow to include all cmake files without full path and .cmake extension! -+# This will allow including all cmake files without full path and .cmake extension! - set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}) - - #include superbuild_macro for get_version() ---- a/Modules/Applications/AppSegmentation/app/otbLargeScaleMeanShift.cxx -+++ b/Modules/Applications/AppSegmentation/app/otbLargeScaleMeanShift.cxx -@@ -64,7 +64,7 @@ private: - "This application can be a preliminary step for an object-based analysis.\n\n" - "It generates a vector data file containing the regions extracted with " - "the MeanShift algorithm. The spatial and range radius parameters allow " -- "to adapt the sensitivity of the algorithm depending on the image dynamic " -+ "adapting the sensitivity of the algorithm depending on the image dynamic " - "and resolution. There is a step to remove small regions whose size " - "(in pixels) is less than the given 'minsize' parameter. These regions " - "are merged to a similar neighbor region. In the output vectors, there " -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
