Bas Couwenberg pushed to branch master at Debian GIS Project / mapserver
Commits: fcd86041 by Bas Couwenberg at 2018-11-25T09:40:08Z Drop cmake-3.12.patch, no longer used. - - - - - b10ffe48 by Bas Couwenberg at 2018-12-25T21:37:58Z Bump Standards-Version to 4.3.0, no changes. - - - - - 4 changed files: - debian/changelog - debian/control - − debian/patches/cmake-3.12.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -2,6 +2,7 @@ mapserver (7.2.1-2) UNRELEASED; urgency=medium * Add patch with changes from PR#5674 for CMake 3.12. * Add Build-Depends-Package field to symbols file. + * Bump Standards-Version to 4.3.0, no changes. -- Bas Couwenberg <[email protected]> Fri, 05 Oct 2018 09:46:56 +0200 ===================================== debian/control ===================================== @@ -47,7 +47,7 @@ Build-Depends: debhelper (>= 9.20160114), docbook-xml, xsltproc Build-Conflicts: libcurl3-openssl-dev -Standards-Version: 4.2.1 +Standards-Version: 4.3.0 Vcs-Browser: https://salsa.debian.org/debian-gis-team/mapserver Vcs-Git: https://salsa.debian.org/debian-gis-team/mapserver.git Homepage: http://www.mapserver.org ===================================== debian/patches/cmake-3.12.patch deleted ===================================== @@ -1,73 +0,0 @@ -Description: Fix errors with CMake 3.12 for get_target_property commands. -Author: Bas Couwenberg <[email protected]> -Bug: https://github.com/mapserver/mapserver/issues/5646 -Bug-Debian: https://bugs.debian.org/906605 - ---- a/mapscript/java/CMakeLists.txt -+++ b/mapscript/java/CMakeLists.txt -@@ -42,6 +42,14 @@ ADD_CUSTOM_COMMAND(TARGET javamapscript - COMMENT "Compiling java source files, creating mapscript.jar" - ) - -+# Workaround for CMake 3.12 error: -+# -+# The LOCATION property may not be read from target "foo". Use -+# the target name directly with add_custom_command, or use the generator -+# expression $<TARGET_FILE>, as appropriate. -+ -+cmake_policy(SET CMP0026 OLD) -+ - get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_javamapscript_REAL_NAME} LOCATION) - install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION lib/jni) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mapscript.jar DESTINATION share/java) ---- a/mapscript/perl/CMakeLists.txt -+++ b/mapscript/perl/CMakeLists.txt -@@ -18,6 +18,14 @@ if(APPLE) - set_target_properties(perlmapscript PROPERTIES SUFFIX ".bundle") - endif(APPLE) - -+# Workaround for CMake 3.12 error: -+# -+# The LOCATION property may not be read from target "foo". Use -+# the target name directly with add_custom_command, or use the generator -+# expression $<TARGET_FILE>, as appropriate. -+ -+cmake_policy(SET CMP0026 OLD) -+ - get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_perlmapscript_REAL_NAME} LOCATION) - set(mapscript_files ${LOC_MAPSCRIPT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/mapscript.pm) - install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${CUSTOM_PERL_VENDOR_ARCH_DIR}/auto/mapscript) ---- a/mapscript/python/CMakeLists.txt -+++ b/mapscript/python/CMakeLists.txt -@@ -46,6 +46,14 @@ execute_process ( COMMAND ${PYTHON_EXECU - # expression $<TARGET_FILE>, as appropriate. - cmake_policy(SET CMP0026 OLD) - -+# Workaround for CMake 3.12 error: -+# -+# The LOCATION property may not be read from target "foo". Use -+# the target name directly with add_custom_command, or use the generator -+# expression $<TARGET_FILE>, as appropriate. -+ -+cmake_policy(SET CMP0026 OLD) -+ - get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_pythonmapscript_REAL_NAME} LOCATION) - set(mapscript_files ${LOC_MAPSCRIPT_LIB} ${CMAKE_CURRENT_BINARY_DIR}/mapscript.py) - install(FILES ${mapscript_files} DESTINATION ${PYTHON_SITE_PACKAGES}) ---- a/mapscript/ruby/CMakeLists.txt -+++ b/mapscript/ruby/CMakeLists.txt -@@ -32,6 +32,14 @@ if(APPLE) - set_target_properties(${SWIG_MODULE_rubymapscript_REAL_NAME} PROPERTIES SUFFIX ".bundle") - endif(APPLE) - -+# Workaround for CMake 3.12 error: -+# -+# The LOCATION property may not be read from target "foo". Use -+# the target name directly with add_custom_command, or use the generator -+# expression $<TARGET_FILE>, as appropriate. -+ -+cmake_policy(SET CMP0026 OLD) -+ - get_target_property(LOC_MAPSCRIPT_LIB ${SWIG_MODULE_rubymapscript_REAL_NAME} LOCATION) - execute_process(COMMAND ${RUBY_EXECUTABLE} -r rbconfig -e "puts RbConfig::CONFIG['vendorarchdir']" OUTPUT_VARIABLE RUBY_VENDORARCHDIR OUTPUT_STRIP_TRAILING_WHITESPACE) - install(FILES ${LOC_MAPSCRIPT_LIB} DESTINATION ${RUBY_VENDORARCHDIR}) ===================================== debian/patches/series ===================================== @@ -2,5 +2,4 @@ hardening.patch perl-mapscript-install.patch ruby-mapscript-install.patch java-hardening.patch -#cmake-3.12.patch pr5674_Use-generator-expressions-in-MapScript-CMakeLists.patch View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/compare/c26ab2cd55f9269bb202af8a27343396fa47583e...b10ffe48026460a2f1d2d07bb3a4f5c3997d4a0d -- View it on GitLab: https://salsa.debian.org/debian-gis-team/mapserver/compare/c26ab2cd55f9269bb202af8a27343396fa47583e...b10ffe48026460a2f1d2d07bb3a4f5c3997d4a0d 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
