[otb] 04/08: Drop patches, applied upstream.
Bas Couwenberg
sebastic at debian.org
Fri Aug 26 19:30:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository otb.
commit a5885280722f77a26bceacc6b4ec0fd4c4c88213
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Aug 26 18:52:18 2016 +0200
Drop patches, applied upstream.
---
debian/changelog | 1 +
debian/patches/cmake-message.patch | 21 ------
debian/patches/series | 2 -
debian/patches/spelling-errors.patch | 134 -----------------------------------
4 files changed, 1 insertion(+), 157 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e907d13..9582236 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ otb (5.6.1+dfsg-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release.
+ * Drop patches, applied upstream.
-- Bas Couwenberg <sebastic at debian.org> Fri, 26 Aug 2016 18:49:41 +0200
diff --git a/debian/patches/cmake-message.patch b/debian/patches/cmake-message.patch
deleted file mode 100644
index 0e49af1..0000000
--- a/debian/patches/cmake-message.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Only use OTB_GIT_STATUS_MESSAGE in message function if set.
- Build failed with:
- CMake Error at CMakeLists.txt:400 (message):
- message called with incorrect number of arguments
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1258
-Applied-Upstream: https://git.orfeo-toolbox.org/otb.git/commitdiff/6ef74581a58861b6774ef05c7c893ddf19b1f464
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -397,7 +397,9 @@ endmacro()
-
- message("\n======================= Begin of OTB cmake summary =======================\n")
-
--message( ${OTB_GIT_STATUS_MESSAGE})
-+if(OTB_GIT_STATUS_MESSAGE)
-+ message( ${OTB_GIT_STATUS_MESSAGE})
-+endif()
- if(OTB_DATA_GIT_STATUS_MESSAGE)
- message( ${OTB_DATA_GIT_STATUS_MESSAGE})
- endif()
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 355cbe1..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-cmake-message.patch
-spelling-errors.patch
diff --git a/debian/patches/spelling-errors.patch b/debian/patches/spelling-errors.patch
deleted file mode 100644
index 3543f03..0000000
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,134 +0,0 @@
-Description: Fix spelling errors.
- allows to <verb> -> allows <verb>ing
- formated -> formatted
- Unkown -> Unknown
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://bugs.orfeo-toolbox.org/view.php?id=1259
-Applied-Upstream: https://git.orfeo-toolbox.org/otb.git/commitdiff/30b55712719bbee182a0ff4f473f2941d1c98b98
-
---- a/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
-+++ b/Modules/Applications/AppClassification/app/otbSampleExtraction.cxx
-@@ -146,7 +146,7 @@ private:
- }
- else
- {
-- otbAppLogFATAL("Unkown output field option : " << this->GetParameterString("outfield"));
-+ otbAppLogFATAL("Unknown output field option : " << this->GetParameterString("outfield"));
- }
-
-
---- a/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
-+++ b/Modules/Filtering/Wavelet/src/otbWaveletGenerator.cxx
-@@ -36,7 +36,7 @@ WaveletGenerator<TMotherWaveletOperator>
- {
- std::ostringstream msg;
- msg << "The mother wavelet ID " << TMotherWaveletOperator;
-- msg << " is unkown or has to be implemented...\n";
-+ msg << " is unknown or has to be implemented...\n";
- throw itk::ExceptionObject(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
-
- return "Unknown";
-@@ -49,7 +49,7 @@ WaveletGenerator<TMotherWaveletOperator>
- {
- std::ostringstream msg;
- msg << "The mother wavelet ID " << TMotherWaveletOperator;
-- msg << " is unkown or has to be implemented...\n";
-+ msg << " is unknown or has to be implemented...\n";
- throw itk::ExceptionObject(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
- }
-
-@@ -60,7 +60,7 @@ WaveletGenerator<TMotherWaveletOperator>
- {
- std::ostringstream msg;
- msg << "The mother wavelet ID " << TMotherWaveletOperator;
-- msg << " is unkown or has to be implemented (check the txx file)...\n";
-+ msg << " is unknown or has to be implemented (check the txx file)...\n";
- throw itk::ExceptionObject(__FILE__, __LINE__, msg.str().c_str(), ITK_LOCATION);
- }
-
---- a/Modules/Applications/AppClassification/app/otbSampleSelection.cxx
-+++ b/Modules/Applications/AppClassification/app/otbSampleSelection.cxx
-@@ -104,7 +104,7 @@ private:
- " - layer : index specifying from which layer to pick geometries.\n"
- " - field : set the field name containing the class.\n"
- " - mask : an optional raster mask can be used to discard samples.\n"
-- " - outrates : allows to output a CSV file that summarizes the sampling rates for each class.\n"
-+ " - outrates : allows outputting a CSV file that summarizes the sampling rates for each class.\n"
-
- "\nAs with the PolygonClassStatistics application, different types of geometry are supported : "
- "polygons, lines, points. \nThe behavior of this application is different for each type of geometry :\n"
-@@ -134,7 +134,7 @@ private:
- SetParameterDescription("instats","Input file storing statistics (XML format)");
-
- AddParameter(ParameterType_OutputFilename, "outrates", "Output rates");
-- SetParameterDescription("outrates","Output rates (CSV formated)");
-+ SetParameterDescription("outrates","Output rates (CSV formatted)");
- MandatoryOff("outrates");
-
- AddParameter(ParameterType_Choice, "sampler", "Sampler type");
---- a/Modules/Filtering/Statistics/include/otbPatternSampler.h
-+++ b/Modules/Filtering/Statistics/include/otbPatternSampler.h
-@@ -28,7 +28,7 @@ namespace otb
- *
- * \brief Periodic sampler for iteration loops
- *
-- * This class allows to do periodic sampling during an iteration loop.
-+ * This class allows doing periodic sampling during an iteration loop.
- *
- * \ingroup OTBStatistics
- */
---- a/Modules/Filtering/Statistics/include/otbPeriodicSampler.h
-+++ b/Modules/Filtering/Statistics/include/otbPeriodicSampler.h
-@@ -28,7 +28,7 @@ namespace otb
- *
- * \brief Periodic sampler for iteration loops
- *
-- * This class allows to do periodic sampling during an iteration loop.
-+ * This class allows doing periodic sampling during an iteration loop.
- *
- * \ingroup OTBStatistics
- */
---- a/Modules/Filtering/Statistics/include/otbRandomSampler.h
-+++ b/Modules/Filtering/Statistics/include/otbRandomSampler.h
-@@ -28,7 +28,7 @@ namespace otb
- *
- * \brief Random sampler for iteration loops
- *
-- * This class allows to do random sampling during an iteration loop.
-+ * This class allows doing random sampling during an iteration loop.
- * It uses the MersenneTwisterRandomGenerator.
- *
- * \ingroup OTBStatistics
---- a/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.txx
-+++ b/Modules/MPI/MPITiffWriter/include/otbSimpleParallelTiffWriter.txx
-@@ -770,7 +770,7 @@ SimpleParallelTiffWriter<TInputImage>
- this->ReleaseInputs();
-
- //Reset global shift on input region (box parameter)
-- //It allows to call multiple update over the writer
-+ //It allows calling multiple updates over the writer
- m_ShiftOutputIndex.Fill(0);
-
- // Wait for other processes
---- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
-+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1Model.cpp
-@@ -951,7 +951,7 @@ namespace ossimplugins
- addMandatory(theProductKwl, prefix, keyImPtX, **itNode, attPixel);
-
- // In TOPSAR products, GCPs are weird (they fall in black lines
-- // between burst. This code allows to move them to a valid area of
-+ // between burst. This code allows moving them to a valid area of
- // the image.
- if(theBurstRecords.size()>2)
- {
---- a/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1SarSensorModel.cpp
-+++ b/Modules/ThirdParty/OssimPlugins/src/ossim/ossimSentinel1SarSensorModel.cpp
-@@ -249,7 +249,7 @@ void ossimSentinel1SarSensorModel::readA
- gcpRecord.imPt.x = getDoubleFromFirstNode(**itNode, attPixel);
-
- // In TOPSAR products, GCPs are weird (they fall in black lines
-- // between burst. This code allows to move them to a valid area of
-+ // between burst. This code allows moving them to a valid area of
- // the image.
- if(theBurstRecords.size()>2)
- {
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/otb.git
More information about the Pkg-grass-devel
mailing list