This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository ossim.
commit de9f40d7f8816843a74fdc17b2f3a974e91d8159 Author: Bas Couwenberg <[email protected]> Date: Wed Dec 16 14:34:38 2015 +0100 Update path in patches. --- debian/patches/avoid_overwrite_build_date.patch | 6 +- debian/patches/cmake | 84 ++++++++++++------------- debian/patches/developed-typo.patch | 4 +- debian/patches/message-typo.patch | 4 +- debian/patches/output-typo.patch | 32 +++++----- debian/patches/unknown-typo.patch | 12 ++-- 6 files changed, 71 insertions(+), 71 deletions(-) diff --git a/debian/patches/avoid_overwrite_build_date.patch b/debian/patches/avoid_overwrite_build_date.patch index 8b0c03a..964421f 100644 --- a/debian/patches/avoid_overwrite_build_date.patch +++ b/debian/patches/avoid_overwrite_build_date.patch @@ -3,9 +3,9 @@ Description: Avoid overwrite build date. it was already defined in command line. Author: Juan Picca <[email protected]> Last-Update: 2015-06-04 ---- ---- a/CMakeLists.txt -+++ b/CMakeLists.txt + +--- a/ossim/CMakeLists.txt ++++ b/ossim/CMakeLists.txt @@ -148,7 +148,9 @@ endif ( ZLIB_FOUND ) #--- # Call the OSSIM macros in OssimUtilities.cmake diff --git a/debian/patches/cmake b/debian/patches/cmake index 7d6a0be..b3354c7 100644 --- a/debian/patches/cmake +++ b/debian/patches/cmake @@ -2,7 +2,7 @@ Description: Added cmake support files. Author: Francesco Paolo Lovergine <[email protected]> --- /dev/null -+++ b/CMakeModules/FindCPPUNIT.cmake ++++ b/ossim/CMakeModules/FindCPPUNIT.cmake @@ -0,0 +1,43 @@ +# - Find CPPUNIT +# Find the native CPPUNIT includes and library @@ -48,7 +48,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(CPPUNIT_LIBRARY CPPUNIT_INCLUDE_DIR ) --- /dev/null -+++ b/CMakeModules/FindFFTW3.cmake ++++ b/ossim/CMakeModules/FindFFTW3.cmake @@ -0,0 +1,24 @@ +# - Find fftw3 library +# Find the native fftw3 includes and library @@ -75,7 +75,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(FFTW3_INCLUDE_DIR FFTW3_LIBRARY) --- /dev/null -+++ b/CMakeModules/FindFFmpeg.cmake ++++ b/ossim/CMakeModules/FindFFmpeg.cmake @@ -0,0 +1,190 @@ +# Locate ffmpeg +# This module defines @@ -268,7 +268,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + message( STATUS "FFMPEG_LIBRARIES = ${FFMPEG_LIBRARIES}" ) +endif( NOT FFMPEG_FIND_QUIETLY ) --- /dev/null -+++ b/CMakeModules/FindFreetype.cmake ++++ b/ossim/CMakeModules/FindFreetype.cmake @@ -0,0 +1,95 @@ +# - Locate FreeType library +# This module defines @@ -366,7 +366,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(FREETYPE_LIBRARY FREETYPE_INCLUDE_DIR_freetype2 FREETYPE_INCLUDE_DIR_ft2build) --- /dev/null -+++ b/CMakeModules/FindGEOS.cmake ++++ b/ossim/CMakeModules/FindGEOS.cmake @@ -0,0 +1,77 @@ +#--- +# File: FindGEOS.cmake @@ -446,7 +446,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + message( STATUS "GEOS_LIBRARY=${GEOS_LIBRARY}" ) +endif( NOT GEOS_FIND_QUIETLY ) --- /dev/null -+++ b/CMakeModules/FindGEOTIFF.cmake ++++ b/ossim/CMakeModules/FindGEOTIFF.cmake @@ -0,0 +1,24 @@ +# - Find geotiff library +# Find the native geotiff includes and library @@ -473,7 +473,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(GEOTIFF_INCLUDE_DIR GEOTIFF_LIBRARY) --- /dev/null -+++ b/CMakeModules/FindGPSTK.cmake ++++ b/ossim/CMakeModules/FindGPSTK.cmake @@ -0,0 +1,24 @@ +# - Find gpstk library +# Find the native gpstk includes and library @@ -500,7 +500,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(GPSTK_INCLUDE_DIR GPSTK_LIBRARY) --- /dev/null -+++ b/CMakeModules/FindJPEG.cmake ++++ b/ossim/CMakeModules/FindJPEG.cmake @@ -0,0 +1,47 @@ +# - Find JPEG +# Find the native JPEG includes and library @@ -550,7 +550,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(JPEG_LIBRARY JPEG_INCLUDE_DIR ) --- /dev/null -+++ b/CMakeModules/FindLASzip.cmake ++++ b/ossim/CMakeModules/FindLASzip.cmake @@ -0,0 +1,118 @@ +############################################################################### +# @@ -671,7 +671,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + message( STATUS "Found LASzip version: ${LASZIP_VERSION}") +endif( NOT LASZIP_FIND_QUIETLY ) --- /dev/null -+++ b/CMakeModules/FindLIBLAS.cmake ++++ b/ossim/CMakeModules/FindLIBLAS.cmake @@ -0,0 +1,103 @@ +#--- +# File: FindLIBLAS.cmake @@ -777,7 +777,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + set(LIBLAS_FOUND "YES") +endif(LIBLAS_LIBRARY AND LIBLASC_LIBRARY AND LIBLAS_INCLUDE_DIR) --- /dev/null -+++ b/CMakeModules/FindMiniZip.cmake ++++ b/ossim/CMakeModules/FindMiniZip.cmake @@ -0,0 +1,26 @@ +# - Find minizip +# Find the native MINIZIP includes and library @@ -806,7 +806,7 @@ Author: Francesco Paolo Lovergine <[email protected]> +INCLUDE(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(MINIZIP DEFAULT_MSG MINIZIP_LIBRARIES MINIZIP_INCLUDE_DIRS) --- /dev/null -+++ b/CMakeModules/FindMrSid.cmake ++++ b/ossim/CMakeModules/FindMrSid.cmake @@ -0,0 +1,88 @@ +# - Find MrSid +# Find the native MrSid includes and library @@ -897,7 +897,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(MRSID_LIBRARIES MRSID_INCLUDE_DIR ) --- /dev/null -+++ b/CMakeModules/FindOMS.cmake ++++ b/ossim/CMakeModules/FindOMS.cmake @@ -0,0 +1,44 @@ +# - Find ossim library +# Find the native ossim includes and library @@ -944,7 +944,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(OMS_INCLUDE_DIR OMS_LIBRARY) --- /dev/null -+++ b/CMakeModules/FindOSG.cmake ++++ b/ossim/CMakeModules/FindOSG.cmake @@ -0,0 +1,124 @@ +# Locate gdal +# This module defines @@ -1071,7 +1071,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + SET(OSG_FOUND "YES") +ENDIF(OSG_LIBRARY AND OSG_INCLUDE_DIR) --- /dev/null -+++ b/CMakeModules/FindOpenCV.cmake ++++ b/ossim/CMakeModules/FindOpenCV.cmake @@ -0,0 +1,85 @@ +#--- +# File: FindOpenCV.cmake @@ -1159,7 +1159,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +endif(OPENCV_INCLUDE_DIR AND OPENCV_CALIB3D_LIBRARY AND OPENCV_CONTRIB_LIBRARY AND OPENCV_CORE_LIBRARY AND OPENCV_FEATURES2D_LIBRARY AND OPENCV_FLANN_LIBRARY AND OPENCV_HIGHGUI_LIBRARY AND OPENCV_IMGPROC_LIBRARY AND OPENCV_LEGACY_LIBRARY AND OPENCV_ML_LIBRARY) --- /dev/null -+++ b/CMakeModules/FindOpenJPEG.cmake ++++ b/ossim/CMakeModules/FindOpenJPEG.cmake @@ -0,0 +1,56 @@ +### +# -*- cmake -*- @@ -1218,7 +1218,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(OPENJPEG_LIBRARY OPENJPEG_INCLUDE_DIR) --- /dev/null -+++ b/CMakeModules/FindPDAL.cmake ++++ b/ossim/CMakeModules/FindPDAL.cmake @@ -0,0 +1,57 @@ +#--- +# File: FindPDAL.cmake @@ -1278,7 +1278,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + message( STATUS "PDAL_LIBRARY=${PDAL_LIBRARY}" ) +endif( NOT PDAL_FIND_QUIETLY ) --- /dev/null -+++ b/CMakeModules/FindPodofo.cmake ++++ b/ossim/CMakeModules/FindPodofo.cmake @@ -0,0 +1,25 @@ +#--- +# File: FindPodofo.cmake @@ -1306,7 +1306,7 @@ Author: Francesco Paolo Lovergine <[email protected]> +include(FindPackageHandleStandardArgs) +FIND_PACKAGE_HANDLE_STANDARD_ARGS(PODOFO DEFAULT_MSG PODOFO_LIBRARY PODOFO_INCLUDE_DIR) --- /dev/null -+++ b/CMakeModules/FindQt5.cmake ++++ b/ossim/CMakeModules/FindQt5.cmake @@ -0,0 +1,165 @@ +# - Find Qt5 +# This module can be used to find Qt5. @@ -1474,7 +1474,7 @@ Author: Francesco Paolo Lovergine <[email protected]> +SET(QT5_FOUND TRUE) + --- /dev/null -+++ b/CMakeModules/FindRapier.cmake ++++ b/ossim/CMakeModules/FindRapier.cmake @@ -0,0 +1,47 @@ +#--- +# File: FindRapier.cmake @@ -1524,7 +1524,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + set( RAPIER_LIBRARIES ${RAPIER_LIBRARY} ) +endif(RAPIER_FOUND) --- /dev/null -+++ b/CMakeModules/FindRegex.cmake ++++ b/ossim/CMakeModules/FindRegex.cmake @@ -0,0 +1,64 @@ +# -*- cmake -*- +# @@ -1591,7 +1591,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(REGEX_INCLUDE_DIR REGEX_LIBRARIES) --- /dev/null -+++ b/CMakeModules/FindSQLITE.cmake ++++ b/ossim/CMakeModules/FindSQLITE.cmake @@ -0,0 +1,61 @@ +#--- +# File: FindSQLITE.cmake @@ -1655,7 +1655,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + message( STATUS "SQLITE_LIBRARY=${SQLITE_LIBRARY}" ) +endif( NOT SQLITE_FIND_QUIETLY ) --- /dev/null -+++ b/CMakeModules/FindStlPort.cmake ++++ b/ossim/CMakeModules/FindStlPort.cmake @@ -0,0 +1,26 @@ +#--- +# $Id: FindStlPort.cmake 21190 2012-06-29 19:54:24Z dburken $ @@ -1684,7 +1684,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(STLPORT_INCLUDE_DIR STLPORT_LIBRARY) --- /dev/null -+++ b/CMakeModules/FindSubversion.cmake ++++ b/ossim/CMakeModules/FindSubversion.cmake @@ -0,0 +1,148 @@ +# - Extract information from a subversion working copy +# The module defines the following variables: @@ -1835,7 +1835,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + message( STATUS "Subversion_VERSION_SVN=${Subversion_VERSION_SVN}" ) +endif( NOT SUBVERSION_FIND_QUIETLY ) --- /dev/null -+++ b/CMakeModules/FindTIFF.cmake ++++ b/ossim/CMakeModules/FindTIFF.cmake @@ -0,0 +1,41 @@ +# - Find TIFF library +# Find the native TIFF includes and library @@ -1879,7 +1879,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(TIFF_INCLUDE_DIR TIFF_LIBRARY) --- /dev/null -+++ b/CMakeModules/FindWMS.cmake ++++ b/ossim/CMakeModules/FindWMS.cmake @@ -0,0 +1,48 @@ +# - Find wms library +# Find the native wms includes and library @@ -1930,7 +1930,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(WMS_INCLUDE_DIR WMS_LIBRARY) --- /dev/null -+++ b/CMakeModules/FindcsmApi.cmake ++++ b/ossim/CMakeModules/FindcsmApi.cmake @@ -0,0 +1,46 @@ +# - Find csmApi library +# Find the native csmApi includes and library @@ -1979,7 +1979,7 @@ Author: Francesco Paolo Lovergine <[email protected]> +ENDIF(CSMAPI_FOUND) +MARK_AS_ADVANCED(CSMAPI_INCLUDE_DIRS CSMAPI_LIBRARY) --- /dev/null -+++ b/CMakeModules/Findossim.cmake ++++ b/ossim/CMakeModules/Findossim.cmake @@ -0,0 +1,68 @@ +#--- +# File: FindOSSIM.cmake @@ -2050,7 +2050,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(OSSIM_INCLUDES OSSIM_INCLUDE_DIR OSSIM_LIBRARY) --- /dev/null -+++ b/CMakeModules/FindossimPlanet.cmake ++++ b/ossim/CMakeModules/FindossimPlanet.cmake @@ -0,0 +1,44 @@ +# - Find ossimPlanet library +# Find the native ossimPlanet includes and library @@ -2097,7 +2097,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(OSSIMPLANET_INCLUDE_DIR OSSIMPLANET_LIBRARY) --- /dev/null -+++ b/CMakeModules/FindossimPredator.cmake ++++ b/ossim/CMakeModules/FindossimPredator.cmake @@ -0,0 +1,44 @@ +# - Find ossimPredator library +# Find the native ossimPredator includes and library @@ -2144,7 +2144,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +MARK_AS_ADVANCED(OSSIMPREDATOR_INCLUDE_DIR OSSIMPREDATOR_LIBRARY) --- /dev/null -+++ b/CMakeModules/OssimCPack.cmake ++++ b/ossim/CMakeModules/OssimCPack.cmake @@ -0,0 +1,156 @@ +# This script sets up packaging targets for each "COMPONENT" as specified in INSTALL commands +# @@ -2303,7 +2303,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + GENERATE_PACKAGING_TARGET(${package}) +ENDFOREACH() --- /dev/null -+++ b/CMakeModules/OssimCPackConfig.cmake.in ++++ b/ossim/CMakeModules/OssimCPackConfig.cmake.in @@ -0,0 +1,73 @@ +# This file will be configured to contain variables for CPack. These variables +# should be set in the CMake list file of the project before CPack module is @@ -2379,7 +2379,7 @@ Author: Francesco Paolo Lovergine <[email protected]> +SET(CPACK_RPM_PACKAGE_DEBUG "1") +SET(CPACK_OSX_PACKAGE_VERSION "10.6") --- /dev/null -+++ b/CMakeModules/OssimCommonVariables.cmake ++++ b/ossim/CMakeModules/OssimCommonVariables.cmake @@ -0,0 +1,233 @@ +################################################################################## +# This currently sets up the options for the WARNING FLAGS for the compiler we are generating for. @@ -2615,7 +2615,7 @@ Author: Francesco Paolo Lovergine <[email protected]> +OSSIM_ADD_COMMON_SETTINGS() + --- /dev/null -+++ b/CMakeModules/OssimDetermineCompiler.cmake ++++ b/ossim/CMakeModules/OssimDetermineCompiler.cmake @@ -0,0 +1,77 @@ +# - If Visual Studio is being used, this script sets the variable OSG_COMPILER +# The principal reason for this is due to MSVC 8.0 SP0 vs SP1 builds. @@ -2695,7 +2695,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + ENDIF(_TRY_RESULT) +ENDIF(MSVC80) --- /dev/null -+++ b/CMakeModules/OssimQt4Macros.cmake ++++ b/ossim/CMakeModules/OssimQt4Macros.cmake @@ -0,0 +1,24 @@ +include(Qt4Macros) +MACRO (OSSIM_QT4_WRAP_UI outfiles) @@ -2722,7 +2722,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +ENDMACRO (OSSIM_QT4_WRAP_UI) --- /dev/null -+++ b/CMakeModules/OssimQt5Macros.cmake ++++ b/ossim/CMakeModules/OssimQt5Macros.cmake @@ -0,0 +1,19 @@ +include(Qt5Macros) +MACRO (OSSIM_QT_WRAP_UI outfiles) @@ -2744,7 +2744,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + +ENDMACRO (OSSIM_QT_WRAP_UI) --- /dev/null -+++ b/CMakeModules/OssimUtilities.cmake ++++ b/ossim/CMakeModules/OssimUtilities.cmake @@ -0,0 +1,383 @@ +################################################################################# +# This was taken from the http://www.cmake.org/Wiki/CMakeMacroParseArguments @@ -3130,7 +3130,7 @@ Author: Francesco Paolo Lovergine <[email protected]> +ENDMACRO(OSSIM_ADD_COMMON_MAKE_UNINSTALL) + --- /dev/null -+++ b/CMakeModules/OssimVersion.cmake ++++ b/ossim/CMakeModules/OssimVersion.cmake @@ -0,0 +1,6 @@ +SET(OSSIM_MAJOR_VERSION_NUMBER "1") +SET(OSSIM_MINOR_VERSION_NUMBER "8") @@ -3139,7 +3139,7 @@ Author: Francesco Paolo Lovergine <[email protected]> +SET(OSSIM_VERSION "${OSSIM_MAJOR_VERSION_NUMBER}.${OSSIM_MINOR_VERSION_NUMBER}.${OSSIM_PATCH_VERSION_NUMBER}" ) +SET(OSSIM_SOVERSION "${OSSIM_MAJOR_VERSION_NUMBER}" ) --- /dev/null -+++ b/CMakeModules/Qt5Macros.cmake ++++ b/ossim/CMakeModules/Qt5Macros.cmake @@ -0,0 +1,83 @@ +# This file is included by FindQt5.cmake, don't include it directly. + @@ -3225,7 +3225,7 @@ Author: Francesco Paolo Lovergine <[email protected]> + + --- /dev/null -+++ b/CMakeModules/cmake_uninstall.cmake.in ++++ b/ossim/CMakeModules/cmake_uninstall.cmake.in @@ -0,0 +1,22 @@ +IF(NOT EXISTS "@CMAKE_BINARY_DIR@/install_manifest.txt") + MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_BINARY_DIR@/install_manifest.txt\"") @@ -3249,8 +3249,8 @@ Author: Francesco Paolo Lovergine <[email protected]> + MESSAGE(STATUS "File \"${file}\" does not exist.") + ENDIF() +ENDFOREACH() ---- a/src/ossim/CMakeLists.txt -+++ b/src/ossim/CMakeLists.txt +--- a/ossim/src/ossim/CMakeLists.txt ++++ b/ossim/src/ossim/CMakeLists.txt @@ -1,4 +1,5 @@ SET(LIB_NAME ossim) +SET(LIB_NAME_STATIC ossimstatic) diff --git a/debian/patches/developed-typo.patch b/debian/patches/developed-typo.patch index 5ea5b97..e3c1939 100644 --- a/debian/patches/developed-typo.patch +++ b/debian/patches/developed-typo.patch @@ -1,8 +1,8 @@ Description: Fix 'developped' typo, replace with 'developed'. Author: Bas Couwenberg <[email protected]> ---- a/src/ossim/base/ossimTieGpt.cpp -+++ b/src/ossim/base/ossimTieGpt.cpp +--- a/ossim/src/ossim/base/ossimTieGpt.cpp ++++ b/ossim/src/ossim/base/ossimTieGpt.cpp @@ -195,7 +195,7 @@ ossimTieGpt::importFromGmlNode(ossimRefP else { //try to read coordinates diff --git a/debian/patches/message-typo.patch b/debian/patches/message-typo.patch index 86d954e..e44c419 100644 --- a/debian/patches/message-typo.patch +++ b/debian/patches/message-typo.patch @@ -1,8 +1,8 @@ Description: Fix 'messsage' typo, replace with 'message'. Author: Bas Couwenberg <[email protected]> ---- a/src/ossim/support_data/ossimNmeaMessage.cpp -+++ b/src/ossim/support_data/ossimNmeaMessage.cpp +--- a/ossim/src/ossim/support_data/ossimNmeaMessage.cpp ++++ b/ossim/src/ossim/support_data/ossimNmeaMessage.cpp @@ -64,7 +64,7 @@ void ossimNmeaMessage::parseMessage(std: m_message = ""; if(!isValidStartChar(static_cast<char>(in.peek()))) diff --git a/debian/patches/output-typo.patch b/debian/patches/output-typo.patch index 3ac26ad..19d9cb7 100644 --- a/debian/patches/output-typo.patch +++ b/debian/patches/output-typo.patch @@ -1,8 +1,8 @@ Description: Fix 'ouput' typo, replace with 'output'. Author: Bas Couwenberg <[email protected]> ---- a/include/ossim/base/ossimImageTypeLut.h -+++ b/include/ossim/base/ossimImageTypeLut.h +--- a/ossim/include/ossim/base/ossimImageTypeLut.h ++++ b/ossim/include/ossim/base/ossimImageTypeLut.h @@ -7,7 +7,7 @@ // Description: // @@ -12,8 +12,8 @@ Author: Bas Couwenberg <[email protected]> // enumeration. // //******************************************************************* ---- a/src/apps/ossim-computeSrtmStats/ossim-computeSrtmStats.cpp -+++ b/src/apps/ossim-computeSrtmStats/ossim-computeSrtmStats.cpp +--- a/ossim/src/apps/ossim-computeSrtmStats/ossim-computeSrtmStats.cpp ++++ b/ossim/src/apps/ossim-computeSrtmStats/ossim-computeSrtmStats.cpp @@ -34,7 +34,7 @@ static void usage() ossimNotify(ossimNotifyLevel_INFO) << "\nNOTES:" @@ -23,8 +23,8 @@ Author: Bas Couwenberg <[email protected]> << "\n- Example: computeSrtmStats *.hgt" << endl; } ---- a/src/apps/ossim-mosaic/ossim-mosaic.cpp -+++ b/src/apps/ossim-mosaic/ossim-mosaic.cpp +--- a/ossim/src/apps/ossim-mosaic/ossim-mosaic.cpp ++++ b/ossim/src/apps/ossim-mosaic/ossim-mosaic.cpp @@ -314,7 +314,7 @@ int main(int argc, char *argv[]) argumentParser.getApplicationUsage()->addCommandLineOption("-m", "Mosiac type (SIMPLE, BLEND, FEATHER, or any MosaicCombinerType [ossimClosestToCenter, ossimFeatherMosaic, etc..]) (default=SIMPLE"); argumentParser.getApplicationUsage()->addCommandLineOption("-w", "Writer type (tiff_strip, jpeg, etc... see ossim-info --writers) (default=tiff_strip)"); @@ -43,8 +43,8 @@ Author: Bas Couwenberg <[email protected]> << "\nExiting..." << std::endl; exit(1); ---- a/src/ossim/base/ossimImageTypeLut.cpp -+++ b/src/ossim/base/ossimImageTypeLut.cpp +--- a/ossim/src/ossim/base/ossimImageTypeLut.cpp ++++ b/ossim/src/ossim/base/ossimImageTypeLut.cpp @@ -7,7 +7,7 @@ // Description: // @@ -54,8 +54,8 @@ Author: Bas Couwenberg <[email protected]> // enumeration. // //******************************************************************* ---- a/src/ossim/projection/ossimRpcProjection.cpp -+++ b/src/ossim/projection/ossimRpcProjection.cpp +--- a/ossim/src/ossim/projection/ossimRpcProjection.cpp ++++ b/ossim/src/ossim/projection/ossimRpcProjection.cpp @@ -1062,7 +1062,7 @@ ossimRpcProjection::optimizeFit(const os //note : please limit the number of tie points // @@ -65,8 +65,8 @@ Author: Bas Couwenberg <[email protected]> // //TBD: use targetVariance! ---- a/src/ossim/projection/ossimSensorModel.cpp -+++ b/src/ossim/projection/ossimSensorModel.cpp +--- a/ossim/src/ossim/projection/ossimSensorModel.cpp ++++ b/ossim/src/ossim/projection/ossimSensorModel.cpp @@ -1301,7 +1301,7 @@ ossimSensorModel::optimizeFit(const ossi //note : please limit the number of tie points // @@ -76,8 +76,8 @@ Author: Bas Couwenberg <[email protected]> // //TBD: use targetVariance! ---- a/src/ossim/support_data/ossimFfRevb.cpp -+++ b/src/ossim/support_data/ossimFfRevb.cpp +--- a/ossim/src/ossim/support_data/ossimFfRevb.cpp ++++ b/ossim/src/ossim/support_data/ossimFfRevb.cpp @@ -564,7 +564,7 @@ void ossimFfRevb::write(ostream& os) con << RADIANCE_DESC; @@ -87,8 +87,8 @@ Author: Bas Couwenberg <[email protected]> { os << setw(RADIANCE_SIZE) << theBandRadiance[i] << SPACE; } ---- a/src/ossim/support_data/ossimNitfImageHeaderV2_1.cpp -+++ b/src/ossim/support_data/ossimNitfImageHeaderV2_1.cpp +--- a/ossim/src/ossim/support_data/ossimNitfImageHeaderV2_1.cpp ++++ b/ossim/src/ossim/support_data/ossimNitfImageHeaderV2_1.cpp @@ -395,7 +395,7 @@ void ossimNitfImageHeaderV2_1::writeStre out.write(theUserDefinedOverflow, 3); } diff --git a/debian/patches/unknown-typo.patch b/debian/patches/unknown-typo.patch index 8846e46..ad7c648 100644 --- a/debian/patches/unknown-typo.patch +++ b/debian/patches/unknown-typo.patch @@ -1,8 +1,8 @@ Description: Fix 'unkown' typo, replace with 'unknown'. Author: Bas Couwenberg <[email protected]> ---- a/include/ossim/support_data/ossimEnviHeader.h -+++ b/include/ossim/support_data/ossimEnviHeader.h +--- a/ossim/include/ossim/support_data/ossimEnviHeader.h ++++ b/ossim/include/ossim/support_data/ossimEnviHeader.h @@ -363,7 +363,7 @@ public: * (little_endian or big_endian) * byte_order: little_endian @@ -12,8 +12,8 @@ Author: Bas Couwenberg <[email protected]> * * wavelength_units: * ---- a/src/ossim/imaging/ossimArcInfoGridWriter.cpp -+++ b/src/ossim/imaging/ossimArcInfoGridWriter.cpp +--- a/ossim/src/ossim/imaging/ossimArcInfoGridWriter.cpp ++++ b/ossim/src/ossim/imaging/ossimArcInfoGridWriter.cpp @@ -269,7 +269,7 @@ bool ossimArcInfoGridWriter::writeBinary { ossimNotify(ossimNotifyLevel_WARN) @@ -23,8 +23,8 @@ Author: Bas Couwenberg <[email protected]> } } ---- a/src/ossim/imaging/ossimOverviewSequencer.cpp -+++ b/src/ossim/imaging/ossimOverviewSequencer.cpp +--- a/ossim/src/ossim/imaging/ossimOverviewSequencer.cpp ++++ b/ossim/src/ossim/imaging/ossimOverviewSequencer.cpp @@ -893,7 +893,7 @@ void ossimOverviewSequencer::resampleTil } default: -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/ossim.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
