Bas Couwenberg pushed to branch master at Debian GIS Project / ossim
Commits: 63e945d4 by Bas Couwenberg at 2018-10-17T14:46:34Z Apply patches by Helmut Grohne to fix FTCBFS. (closes: #911233) - - - - - b117a568 by Bas Couwenberg at 2018-10-17T15:11:29Z Set distribution to unstable. - - - - - 4 changed files: - debian/changelog - + debian/patches/cross-build.patch - debian/patches/series - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +ossim (2.5.2-2) unstable; urgency=medium + + * Team upload. + * Apply patches by Helmut Grohne to fix FTCBFS. + (closes: #911233) + + -- Bas Couwenberg <[email protected]> Wed, 17 Oct 2018 17:11:19 +0200 + ossim (2.5.2-1) unstable; urgency=medium * Team upload. ===================================== debian/patches/cross-build.patch ===================================== @@ -0,0 +1,15 @@ +Description: Don't set CMAKE_LIBRARY_PATH for cross builds. +Author: Helmut Grohne <[email protected]> +Bug-Debian: https://bugs.debian.org/911233 +Forwarded: https://github.com/ossimlabs/ossim/issues/208 + +--- a/cmake/CMakeModules/OssimCommonVariables.cmake ++++ b/cmake/CMakeModules/OssimCommonVariables.cmake +@@ -265,7 +265,6 @@ MACRO(OSSIM_ADD_COMMON_SETTINGS) + SET(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};${OSSIM_DEPENDENCIES}/lib${LIBSUFFIX}") + SET(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};${OSSIM_DEPENDENCIES}/include") + ENDIF() +- SET(CMAKE_LIBRARY_PATH "${CMAKE_LIBRARY_PATH};/usr/lib;/usr/local/lib;/usr/lib64;/usr/lib/x86_64-linux-gnu") + SET(CMAKE_INCLUDE_PATH "${CMAKE_INCLUDE_PATH};${OSSIM_DEV_HOME}/ossim/include;/usr/include;/usr/local/include") + + #################################### ADd some common options for all modules to use ################################### ===================================== debian/patches/series ===================================== @@ -1 +1,2 @@ spelling-errors.patch +cross-build.patch ===================================== debian/rules ===================================== @@ -38,6 +38,7 @@ CMAKE_OPTS = \ -DBUILD_SHARED_LIBS=ON \ -DFREETYPE_INCLUDE_DIRS=/usr/include/freetype2 \ -DGEOS_INCLUDE_DIR=/usr/include/geos \ + -DINSTALL_LIBRARY_DIR:STRING=lib \ -DOSSIM_BUILD_DATE=$(BUILD_DATE) override_dh_auto_clean: View it on GitLab: https://salsa.debian.org/debian-gis-team/ossim/compare/302cf18a7e7a78eb2c1f6bd14c6b061ee99dd73a...b117a568d5ce321d49ebaef0c4de0190d2629030 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/ossim/compare/302cf18a7e7a78eb2c1f6bd14c6b061ee99dd73a...b117a568d5ce321d49ebaef0c4de0190d2629030 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ Pkg-grass-devel mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-grass-devel
