ENH: Merged from origin/develop

Documentation/SoftwareGuide/Latex/ContributorList.tex

@@ -2,6 +2,7 @@ Adamo Ferro,
 Aik Song Chia (CRISP),
 Alexis Huck (Magellium),
 Amit Kulkarni,
+Andreas Tile (Debian GIS),
 Angelos Tzotsos,
 Antonio Valentino,
 Aur\'elien Bricier (CS),
@@ -44,6 +45,7 @@ Patrick Imbo (CS),
 Remi Cresson (Irstea),
 Rik Bellens,
 Romain Garrigues (CS),
+Sebastiaan Couwenberg (Debian GIS),
 S\'ebastien Dinot (CS),
 S\'ebastien Harasse (CS),
 St\'ephane Albert (CS),

SuperBuild/CMake/External_qt4.cmake

@@ -66,7 +66,7 @@ else()
       INSTALL_DIR ${SB_INSTALL_PREFIX}
       DOWNLOAD_DIR ${DOWNLOAD_LOCATION}
       CONFIGURE_COMMAND
-        ${QT4_SB_SRC}/configure -prefix ${SB_INSTALL_PREFIX} -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-webkit -qt-sql-sqlite -plugin-sql-sqlite -no-nis -no-qt3support  -system-zlib -system-libpng -system-libtiff -system-libjpeg -system-sqlite -L ${SB_INSTALL_PREFIX}/lib -I ${SB_INSTALL_PREFIX}/include -I ${SB_INSTALL_PREFIX}/include/freetype2
+        ${QT4_SB_SRC}/configure -prefix ${SB_INSTALL_PREFIX} -opensource -confirm-license -release -shared -nomake demos -nomake examples -nomake tools -no-phonon-backend -no-phonon -no-script -no-scripttools -no-multimedia -no-webkit -qt-sql-sqlite -plugin-sql-sqlite -no-nis -no-qt3support  -system-zlib -system-libpng -system-libtiff -system-libjpeg -system-sqlite -L ${SB_INSTALL_PREFIX}/lib -I ${SB_INSTALL_PREFIX}/include -I ${SB_INSTALL_PREFIX}/include/freetype2 -no-xrender -no-fontconfig -no-sm
       DEPENDS ${${proj}_DEPENDENCIES}
       )
   endif()

SuperBuild/CMake/Package_Macro.cmake

@@ -202,6 +202,12 @@ function(install_common)
     find_path(GDAL_DATA epsg.wkt ${PACKAGE_INSTALLDIR}/share/gdal)
     install(DIRECTORY ${GDAL_DATA} DESTINATION ${DATA_DIR})
 
+    ####################### install GeoTIFF data ###########################
+    install(DIRECTORY ${PACKAGE_INSTALLDIR}/share/epsg_csv DESTINATION ${DATA_DIR})
+
+    ####################### install OSSIM data ###########################
+    install(DIRECTORY ${PACKAGE_INSTALLDIR}/share/ossim DESTINATION ${DATA_DIR})
+
     ####################### install otbcli scripts ######################
     file(GLOB CLI_SCRIPTS ${PACKAGE_INSTALLDIR}/bin/otbcli*)
     foreach(CLI_SCRIPT ${CLI_SCRIPTS})