Bas Couwenberg pushed to branch master at Debian GIS Project / qmapshack
Commits: 5dc5dddf by Bas Couwenberg at 2021-09-03T22:28:01+02:00 Update proj.patch with proj.h support. - - - - - 7360d2cf by Bas Couwenberg at 2021-09-03T22:28:18+02:00 Set distribution to unstable. - - - - - 2 changed files: - debian/changelog - debian/patches/proj.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,9 @@ +qmapshack (1.16.0-2) unstable; urgency=medium + + * Update proj.patch with proj.h support. + + -- Bas Couwenberg <[email protected]> Fri, 03 Sep 2021 22:28:03 +0200 + qmapshack (1.16.0-1) unstable; urgency=medium * Move from experimental to unstable. ===================================== debian/patches/proj.patch ===================================== @@ -4,7 +4,7 @@ Forwarded: not-needed --- /dev/null +++ b/cmake/Modules/FindPROJ.cmake -@@ -0,0 +1,152 @@ +@@ -0,0 +1,164 @@ +#.rst: +# FindPROJ +# -------- @@ -98,6 +98,18 @@ Forwarded: not-needed + string(REGEX REPLACE "^.*PJ_VERSION [0-9][0-9]([0-9]).*$" "\\1" PROJ_VERSION_PATCH "${PROJ_H}") + set(PROJ_VERSION "${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH}") + set(PROJ_VERSION_COUNT 3) ++else() ++ find_path(PROJ_INCLUDE_DIR NAMES proj.h ${_PROJ_SEARCH} PATH_SUFFIXES include) ++ mark_as_advanced(PROJ_INCLUDE_DIR) ++ ++ if(PROJ_INCLUDE_DIR AND EXISTS "${PROJ_INCLUDE_DIR}/proj.h") ++ file(READ ${PROJ_INCLUDE_DIR}/proj.h proj_version) ++ string(REGEX REPLACE "^.*PROJ_VERSION_MAJOR +([0-9]+).*$" "\\1" PROJ_VERSION_MAJOR "${proj_version}") ++ string(REGEX REPLACE "^.*PROJ_VERSION_MINOR +([0-9]+).*$" "\\1" PROJ_VERSION_MINOR "${proj_version}") ++ string(REGEX REPLACE "^.*PROJ_VERSION_PATCH +([0-9]+).*$" "\\1" PROJ_VERSION_PATCH "${proj_version}") ++ set(PROJ_VERSION "${PROJ_VERSION_MAJOR}.${PROJ_VERSION_MINOR}.${PROJ_VERSION_PATCH}") ++ set(PROJ_VERSION_COUNT 3) ++ endif() +endif() + +# Allow PROJ_LIBRARY to be set manually, as the location of the proj library View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/-/compare/aa00bfccb164d70b8ac39ff3389c6ab442025268...7360d2cf513b20f4b64ebb0a5e3ff89cc76243f6 -- View it on GitLab: https://salsa.debian.org/debian-gis-team/qmapshack/-/compare/aa00bfccb164d70b8ac39ff3389c6ab442025268...7360d2cf513b20f4b64ebb0a5e3ff89cc76243f6 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
