[Git][debian-gis-team/otb][master] 7 commits: New upstream version 6.6.0~rc3+dfsg

Bas Couwenberg gitlab at salsa.debian.org
Sat Jun 9 09:21:59 BST 2018 

Bas Couwenberg pushed to branch master at Debian GIS Project / otb


Commits:
7c897dd2 by Bas Couwenberg at 2018-06-08T16:55:40+02:00
New upstream version 6.6.0~rc3+dfsg
- - - - -
569ab2c5 by Bas Couwenberg at 2018-06-08T16:56:01+02:00
Merge tag 'upstream/6.6.0_rc3+dfsg'

Upstream version 6.6.0~rc3+dfsg

- - - - -
4820c028 by Bas Couwenberg at 2018-06-08T16:56:26+02:00
New upstream release candidate.

- - - - -
fee1126f by Bas Couwenberg at 2018-06-08T16:57:12+02:00
Drop spelling-errors.patch, applied upstream.

- - - - -
c1a9c242 by Bas Couwenberg at 2018-06-08T21:48:45+02:00
Update symbols for amd64.

- - - - -
88a515ba by Bas Couwenberg at 2018-06-08T23:25:25+02:00
Add lintian override for manpage-has-errors-from-man.

- - - - -
4c640d4b by Bas Couwenberg at 2018-06-08T23:25:25+02:00
Set distribution to experimental.

- - - - -


12 changed files:

- Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
- Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
- Modules/ThirdParty/Shark/otb-module-init.cmake
- debian/changelog
- debian/libotbice-6.6-1.symbols
- debian/libotbiogdal-6.6-1.symbols
- debian/libotbiokml-6.6-1.symbols
- debian/libotbsampling-6.6-1.symbols
- + debian/otb-bin-qt.lintian-overrides
- + debian/otb-bin.lintian-overrides
- − debian/patches/series
- − debian/patches/spelling-errors.patch


Changes:

=====================================
Modules/Applications/AppDimensionalityReduction/app/otbVectorDimensionalityReduction.cxx
=====================================
--- 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");
         }
       }
 


=====================================
Modules/Learning/DimensionalityReductionLearning/include/otbAutoencoderModel.h
=====================================
--- 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;
 };


=====================================
Modules/ThirdParty/Shark/otb-module-init.cmake
=====================================
--- a/Modules/ThirdParty/Shark/otb-module-init.cmake
+++ b/Modules/ThirdParty/Shark/otb-module-init.cmake
@@ -20,8 +20,10 @@
 
 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.")
+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.\
+   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
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-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 at debian.org>  Thu, 07 Jun 2018 23:12:47 +0200
+ -- Bas Couwenberg <sebastic at 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
=====================================
--- a/debian/libotbice-6.6-1.symbols
+++ b/debian/libotbice-6.6-1.symbols
@@ -1,4 +1,4 @@
-# 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 at Base 6.2.0
  (optional=templinst)_ZN18vnl_matrix_inverseIdED1Ev at Base 6.2.0
@@ -1580,7 +1580,6 @@ libOTBIce-6.6.so.1 #PACKAGE# #MINVER#
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE15GetGeoTransformEv at Base 6.2.0
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE16GetGCPProjectionB5cxx11Ev at Base 6.2.0
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE16GetProjectionRefB5cxx11Ev at Base 6.2.0
- (optional=templinst)_ZNK3otb11VectorImageIfLj2EE16GetSignedSpacingEv at Base 6.6.0~rc2
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE18GetLowerLeftCornerEv at Base 6.2.0
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE18GetUpperLeftCornerEv at Base 6.2.0
  (optional=templinst)_ZNK3otb11VectorImageIfLj2EE19GetImageKeywordlistEv at Base 6.2.0


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


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


=====================================
debian/libotbsampling-6.6-1.symbols
=====================================
--- a/debian/libotbsampling-6.6-1.symbols
+++ b/debian/libotbsampling-6.6-1.symbols
@@ -1,4 +1,4 @@
-# SymbolsHelper-Confirmed: 6.6.0~rc2 i386
+# SymbolsHelper-Confirmed: 6.6.0~rc3 amd64
 libOTBSampling-6.6.so.1 #PACKAGE# #MINVER#
  _ZN3itk13ProcessObject18SetNumberOfThreadsEj at Base 6.6.0~rc1
  _ZN3itk13ProcessObject19AbortGenerateDataOnEv at 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 at Base 5.8.0
  (optional=templinst)_ZNKSt5ctypeIcE8do_widenEc at Base 5.6.0
  (optional=templinst)_ZNSt6vectorIN3itk12SmartPointerIN3otb22SamplingRateCalculatorEEESaIS4_EE17_M_realloc_insertIJS4_EEEvN9__gnu_cxx17__normal_iteratorIPS4_S6_EEDpOT_ at Base 6.2.0
- (optional=templinst)_ZNSt6vectorIN3otb18sampleAugmentation12NeighborTypeESaIS2_EE17_M_realloc_insertIJS2_EEEvN9__gnu_cxx17__normal_iteratorIPS2_S4_EEDpOT_ at Base 6.6.0~rc2
  (optional=templinst)_ZNSt6vectorIN5boost14iterator_rangeIN9__gnu_cxx17__normal_iteratorIPKcNSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEEEEEESaISD_EE17_M_realloc_insertIJSD_EEEvNS3_IPSD_SF_EEDpOT_ at Base 6.2.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED1Ev at Base 5.8.0
  (optional=templinst)_ZNSt6vectorINSt7__cxx1112basic_stringIcSt11char_traitsIcESaIcEEESaIS5_EED2Ev at Base 5.8.0


=====================================
debian/otb-bin-qt.lintian-overrides
=====================================
--- /dev/null
+++ b/debian/otb-bin-qt.lintian-overrides
@@ -0,0 +1,3 @@
+# Unbreakable long string
+manpage-has-errors-from-man usr/share/man/man1/otb*_ImageDimensionalityReduction.1.gz *
+


=====================================
debian/otb-bin.lintian-overrides
=====================================
--- /dev/null
+++ b/debian/otb-bin.lintian-overrides
@@ -0,0 +1,3 @@
+# Unbreakable long string
+manpage-has-errors-from-man usr/share/man/man1/otb*_ImageDimensionalityReduction.1.gz *
+


=====================================
debian/patches/series deleted
=====================================
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-spelling-errors.patch


=====================================
debian/patches/spelling-errors.patch deleted
=====================================
--- a/debian/patches/spelling-errors.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Fix spelling errors.
- * Writting -> Writing
-Author: Bas Couwenberg <sebastic at 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;
- };



View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/compare/7133170e70ddd0c38609a182695e9885b2107fd0...4c640d4bd99243933483476d2669f59dc6154aac

-- 
View it on GitLab: https://salsa.debian.org/debian-gis-team/otb/compare/7133170e70ddd0c38609a182695e9885b2107fd0...4c640d4bd99243933483476d2669f59dc6154aac
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/20180609/bd41e4ae/attachment-0001.html>

More information about the Pkg-grass-devel mailing list