Jérôme Benoit pushed to branch master at Debian Med / igraph
Commits: 30bbaa29 by Jerome Benoit at 2024-07-15T23:12:23+02:00 Debian patch 0.10.13+ds-2 - - - - - 2 changed files: - debian/changelog - debian/patches/upstream-fix-multiarch-file_conflict.patch Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,12 @@ +igraph (0.10.13+ds-2) unstable; urgency=medium + + * Debianization: + - d/patches/*: + - -d/p/upstream-fix-multiarch-file_conflict.patch, correct + (thanks to Szabolcs Horvat <[email protected]> for the correction). + + -- Jerome Benoit <[email protected]> Mon, 15 Jul 2024 21:11:34 +0000 + igraph (0.10.13+ds-1) unstable; urgency=medium * New upstream micro version. ===================================== debian/patches/upstream-fix-multiarch-file_conflict.patch ===================================== @@ -5,11 +5,27 @@ Description: upstream: fix: multiarch: file-conflict Origin: debian Forwarded: https://github.com/igraph/igraph/pull/2372 Author: Jerome Benoit <[email protected]> -Last-Update: 2023-07-15 +Author: Szabolcs Horvat <[email protected]> +Last-Update: 2024-07-15 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt -@@ -431,6 +431,11 @@ +@@ -375,6 +375,14 @@ + "$<$<BOOL:${PLFIT_INCLUDE_DIRS}>:${PLFIT_INCLUDE_DIRS}>" + ) + ++if(CMAKE_LIBRARY_ARCHITECTURE) ++ target_include_directories( ++ igraph ++ PUBLIC ++ $<INSTALL_INTERFACE:include/${CMAKE_LIBRARY_ARCHITECTURE}/igraph> ++ ) ++endif() ++ + if(MATH_LIBRARY) + target_link_libraries(igraph PUBLIC ${MATH_LIBRARY}) + endif() +@@ -431,6 +439,11 @@ # GNUInstallDirs be included before generating the pkgconfig file, as it defines # CMAKE_INSTALL_LIBDIR and CMAKE_INSTALL_INCLUDEDIR variables. include(GNUInstallDirs) @@ -21,7 +37,7 @@ Last-Update: 2023-07-15 # Generate pkgconfig file include(pkgconfig_helpers) -@@ -474,7 +479,7 @@ +@@ -474,7 +487,7 @@ ) install( DIRECTORY ${PROJECT_BINARY_DIR}/include/ View it on GitLab: https://salsa.debian.org/med-team/igraph/-/commit/30bbaa29f6bdba1ef32b5a633644207939fe43d9 -- This project does not include diff previews in email notifications. View it on GitLab: https://salsa.debian.org/med-team/igraph/-/commit/30bbaa29f6bdba1ef32b5a633644207939fe43d9 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ debian-med-commit mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/debian-med-commit
