Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx

@@ -143,7 +143,7 @@ private:
       "parameter can't be used for other models"); //
     MandatoryOff("pcadim");
     
-    AddParameter(ParameterType_Choice, "mode", "Writting mode"); //
+    AddParameter(ParameterType_Choice, "mode", "Writing mode"); //
     SetParameterDescription("mode", "This parameter determines if the output "
       "file is overwritten or updated [overwrite/update]. If an output file "
       "name is given, the original file is copied before creating the new features.");
@@ -325,7 +325,7 @@ private:
       else
         {
         otbAppLogFATAL(<< "Error when creating the output file" <<
-          GetParameterString("mode") << " : unsupported writting mode type");
+          GetParameterString("mode") << " : unsupported writing mode type");
         }
       }
 

Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h

@@ -178,7 +178,7 @@ private:
   itk::Array<double> m_Beta; // Sparsity regularization parameter
   double m_InitFactor; // Weight initialization factor (the weights are intialized at m_initfactor/sqrt(inputDimension)  )
 
-  bool m_WriteLearningCurve; // Flag for writting the learning curve into a txt file
+  bool m_WriteLearningCurve; // Flag for writing the learning curve into a txt file
   std::string m_LearningCurveFileName; // Name of the output learning curve printed after training
   bool m_WriteWeights;
 };

Modules/ThirdParty/Shark/otb-module-init.cmake

@@ -21,7 +21,9 @@
 find_package ( Shark REQUIRED )
 
 if ( SHARK_USE_OPENMP AND NOT OTB_USE_OPENMP )
-  message(WARNING "Shark library is built with OpenMP and you have OTB_USE_OPENMP set to OFF.")
+  message(WARNING "Shark library is built with OpenMP and you have OTB_USE_OPENMP set to OFF.\
+   It will be turned to ON to allow compilation.")
+  set( OTB_USE_OPENMP "ON" CACHE BOOL "Add openmp compiler and linker flags" FORCE )
 endif()
 
 mark_as_advanced( Shark_DIR )

debian/changelog

-otb (6.6.0~rc2+dfsg-1~exp2) UNRELEASED; urgency=medium
+otb (6.6.0~rc3+dfsg-1~exp1) experimental; urgency=medium
 
+  * Team upload.
+  * New upstream release candidate.
   * Update symbols for amd64 & i386.
   * Add manpages for new executables.
   * Add patch to fix spelling errors.
+  * Drop spelling-errors.patch, applied upstream.
+  * Add lintian override for manpage-has-errors-from-man.
 
- -- Bas Couwenberg <sebastic@debian.org>  Thu, 07 Jun 2018 23:12:47 +0200
+ -- Bas Couwenberg <sebastic@debian.org>  Fri, 08 Jun 2018 20:34:54 +0200
 
 otb (6.6.0~rc2+dfsg-1~exp1) experimental; urgency=medium
 

debian/libotbice-6.6-1.symbols

-# SymbolsHelper-Confirmed: 6.6.0~rc2 i386
+# SymbolsHelper-Confirmed: 6.6.0~rc3 amd64
 libOTBIce-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZN18vnl_matrix_inverseIdED0Ev@Base 6.2.0
  (optional=templinst)_ZN18vnl_matrix_inverseIdED1Ev@Base 6.2.0
@@ -1580,7 +1580,6 @@ libOTBIce-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE15GetGeoTransformEv@Base 6.2.0
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE16GetGCPProjectionB5cxx11Ev@Base 6.2.0
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE16GetProjectionRefB5cxx11Ev@Base 6.2.0
- (optional=templinst)_ZNK3otb11VectorImageIfLj2EE16GetSignedSpacingEv@Base 6.6.0~rc2
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE18GetLowerLeftCornerEv@Base 6.2.0
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE18GetUpperLeftCornerEv@Base 6.2.0
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE19GetImageKeywordlistEv@Base 6.2.0

debian/libotbiogdal-6.6-1.symbols

-# SymbolsHelper-Confirmed: 6.6.0~rc2 i386
+# SymbolsHelper-Confirmed: 6.6.0~rc3 amd64
 libOTBIOGDAL-6.6.so.1 #PACKAGE# #MINVER#
  _ZGVZN3otb24GDALDriverManagerWrapper11GetInstanceEvE17theUniqueInstance@Base 6.2.0
  _ZN3itk10DataObject15CopyInformationEPKS0_@Base 6.2.0
@@ -345,6 +345,7 @@ libOTBIOGDAL-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZNK3itk8TreeNodeINS_12SmartPointerIN3otb8DataNodeIdLj2EdEEEEE13CreateAnotherEv@Base 6.2.0
  (optional=templinst)_ZNK3itk8TreeNodeINS_12SmartPointerIN3otb8DataNodeIdLj2EdEEEEE14GetNameOfClassEv@Base 6.2.0
  (optional=templinst)_ZNK3otb10ObjectListINS_7PolygonIdEEE13CreateAnotherEv@Base 6.2.0
+ (optional=templinst)_ZNK3otb10ObjectListINS_7PolygonIdEEE13GetNthElementEj@Base 6.6.0~rc3
  (optional=templinst)_ZNK3otb10ObjectListINS_7PolygonIdEEE14GetNameOfClassEv@Base 6.2.0
  (optional=templinst)_ZNK3otb10ObjectListINS_7PolygonIdEEE16GetNthDataObjectEj@Base 6.6.0~rc1
  (optional=templinst)_ZNK3otb10ObjectListINS_7PolygonIdEEE4SizeEv@Base 6.6.0~rc1

debian/libotbiokml-6.6-1.symbols

-# SymbolsHelper-Confirmed: 6.6.0~rc2 i386
+# SymbolsHelper-Confirmed: 6.6.0~rc3 amd64
 libOTBIOKML-6.6.so.1 #PACKAGE# #MINVER#
  _ZN3itk10DataObject15CopyInformationEPKS0_@Base 5.2.0
  _ZN3itk10DataObject16SetRealTimeStampENS_13RealTimeStampE@Base 5.2.0
@@ -129,7 +129,6 @@ libOTBIOKML-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZN3itk9TransformIdLj2ELj2EED1Ev@Base 5.2.0
  (optional=templinst)_ZN3itk9TransformIdLj2ELj2EED2Ev@Base 5.2.0
  (optional=templinst)_ZN3itklsIdLj2EEERSoS1_RKNS_5PointIT_XT0_EEE@Base 6.6.0~rc1
- (optional=templinst)_ZN3itklsIdLj2EEERSoS1_RKNS_6VectorIT_XT0_EEE@Base 6.6.0~rc2
  (optional=templinst)_ZN3otb10ObjectListINS_7PolygonIdEEE3NewEv@Base 5.2.0
  (optional=templinst)_ZN3otb10ObjectListINS_7PolygonIdEEE8PushBackEPS2_@Base 5.2.0
  (optional=templinst)_ZN3otb10ObjectListINS_7PolygonIdEEED0Ev@Base 5.2.0
@@ -447,6 +446,7 @@ libOTBIOKML-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZNK3itk9TransformIdLj2ELj2EE62PreservationOfPrincipalDirectionDiffusionTensor3DReorientationENS_17DiffusionTensor3DIdEENS_7Array2DIdEE@Base 5.2.0
  (optional=templinst)_ZNK3itk9TransformIdLj2ELj2EE8IsLinearEv@Base 5.2.0
  (optional=templinst)_ZNK3otb10ObjectListINS_7PolygonIdEEE13CreateAnotherEv@Base 5.2.0
+ (optional=templinst)_ZNK3otb10ObjectListINS_7PolygonIdEEE13GetNthElementEj@Base 6.6.0~rc3
  (optional=templinst)_ZNK3otb10ObjectListINS_7PolygonIdEEE14GetNameOfClassEv@Base 5.2.0
  (optional=templinst)_ZNK3otb10ObjectListINS_7PolygonIdEEE16GetNthDataObjectEj@Base 6.6.0~rc1
  (optional=templinst)_ZNK3otb10ObjectListINS_7PolygonIdEEE4SizeEv@Base 6.6.0~rc1

debian/libotbsampling-6.6-1.symbols

-# SymbolsHelper-Confirmed: 6.6.0~rc2 i386
+# SymbolsHelper-Confirmed: 6.6.0~rc3 amd64
 libOTBSampling-6.6.so.1 #PACKAGE# #MINVER#
  _ZN3itk13ProcessObject18SetNumberOfThreadsEj@Base 6.6.0~rc1
  _ZN3itk13ProcessObject19AbortGenerateDataOnEv@Base 6.6.0~rc1
@@ -136,7 +136,6 @@ libOTBSampling-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZNK5boost16exception_detail10clone_implINS0_19error_info_injectorINS_17bad_function_callEEEE7rethrowEv@Base 5.8.0
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc@Base 5.6.0
  (optional=templinst)_ZNSt6vectorIN3itk12SmartPointerIN3otb22SamplingRateCalculatorEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_@Base 6.2.0
- (optional=templinst)_ZNSt6vectorIN3otb18sampleAugmentation12NeighborTypeESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_@Base 6.6.0~rc2
  (optional=templinst)_ZNSt6vectorIN5boost14iterator_rangeIN9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEEESaISD_EE17_M_realloc_insertIJSD_EEEvNS3_IPSD_SF_EEDpOT_@Base 6.2.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED1Ev@Base 5.8.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED2Ev@Base 5.8.0

debian/otb-bin-qt.lintian-overrides

+# Unbreakable long string
+manpage-has-errors-from-man usr/share/man/man1/otb*_ImageDimensionalityReduction.1.gz *
+

debian/otb-bin.lintian-overrides

+# Unbreakable long string
+manpage-has-errors-from-man usr/share/man/man1/otb*_ImageDimensionalityReduction.1.gz *
+

debian/patches/series

-spelling-errors.patch

debian/patches/spelling-errors.patch

-Description: Fix spelling errors.
- * Writting -> Writing
-Author: Bas Couwenberg <sebastic@debian.org>
-Forwarded: https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/issues/1633
-Applied-Upstream: https://gitlab.orfeo-toolbox.org/orfeotoolbox/otb/commit/6b3198ce33ee0d5669756defa90e11e8fc9cd58a
-
---- a/Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
-+++ b/Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
-@@ -143,7 +143,7 @@ private:
-       "parameter can't be used for other models"); //
-     MandatoryOff("pcadim");
-     
--    AddParameter(ParameterType_Choice, "mode", "Writting mode"); //
-+    AddParameter(ParameterType_Choice, "mode", "Writing mode"); //
-     SetParameterDescription("mode", "This parameter determines if the output "
-       "file is overwritten or updated [overwrite/update]. If an output file "
-       "name is given, the original file is copied before creating the new features.");
-@@ -325,7 +325,7 @@ private:
-       else
-         {
-         otbAppLogFATAL(<< "Error when creating the output file" <<
--          GetParameterString("mode") << " : unsupported writting mode type");
-+          GetParameterString("mode") << " : unsupported writing mode type");
-         }
-       }
- 
---- a/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
-+++ b/Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
-@@ -178,7 +178,7 @@ private:
-   itk::Array<double> m_Beta; // Sparsity regularization parameter
-   double m_InitFactor; // Weight initialization factor (the weights are intialized at m_initfactor/sqrt(inputDimension)  )
- 
--  bool m_WriteLearningCurve; // Flag for writting the learning curve into a txt file
-+  bool m_WriteLearningCurve; // Flag for writing the learning curve into a txt file
-   std::string m_LearningCurveFileName; // Name of the output learning curve printed after training
-   bool m_WriteWeights;
- };