Andreas Tille pushed to branch master at Debian Med / libxdf
Commits: 6e6af872 by Juhani Numminen at 2021-01-05T12:48:29+02:00 d/patches: Update shared_and_static.patch to fix undefined references to pugixml symbols. Closes: 977953 - - - - - 0cd5b455 by Juhani Numminen at 2021-01-05T12:55:35+02:00 d/patches: Delete inactive files soversion.patch and use_debian_packaged_pugixml.patch. They have been obsoleted by shared_and_static.patch since 0.99.6+dfsg-1. - - - - - 171457ee by Juhani Numminen at 2021-01-05T13:57:25+02:00 d/patches: Add cmake_config_file.patch to install CMake config files in a multiarch location. - - - - - e50a5a5f by Juhani Numminen at 2021-01-05T14:18:20+02:00 With the new patch, cmake files and headers do not need renaming. Handle them in d/libxdf-dev.install instead of d/rules. - - - - - 82c859b1 by Juhani Numminen at 2021-01-05T14:23:56+02:00 d/control: add Multi-Arch: same to both binary packages. - - - - - 6bf90eaf by Juhani Numminen at 2021-01-05T14:28:06+02:00 Update changelog. - - - - - 9 changed files: - debian/changelog - debian/control - + debian/libxdf-dev.install - + debian/patches/cmake_config_file.patch - debian/patches/series - debian/patches/shared_and_static.patch - − debian/patches/soversion.patch - − debian/patches/use_debian_packaged_pugixml.patch - debian/rules Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,20 @@ +libxdf (0.99.6+dfsg-3) UNRELEASED; urgency=medium + + [ Juhani Numminen ] + * d/patches: + - Update shared_and_static.patch to fix undefined references to pugixml. + Closes: 977953. + - Delete inactive files soversion.patch and + use_debian_packaged_pugixml.patch. They have been obsoleted by + shared_and_static.patch since 0.99.6+dfsg-1. + - Add cmake_config_file.patch to install CMake config files in a multiarch + location. + * With the new patch, cmake files and headers do not need renaming. + Handle them in d/libxdf-dev.install instead of d/rules. + * d/control: add Multi-Arch: same to both binary packages. + + -- Juhani Numminen <[email protected]> Tue, 05 Jan 2021 14:24:12 +0200 + libxdf (0.99.6+dfsg-2) unstable; urgency=medium * Team upload. ===================================== debian/control ===================================== @@ -15,6 +15,7 @@ Rules-Requires-Root: no Package: libxdf0 Architecture: any +Multi-Arch: same Section: libs Depends: ${shlibs:Depends}, ${misc:Depends} @@ -26,6 +27,7 @@ Description: C++ library for loading XDF files Package: libxdf-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: libxdf0 (= ${binary:Version}), ${shlibs:Depends}, ===================================== debian/libxdf-dev.install ===================================== @@ -0,0 +1,2 @@ +usr/include/ +usr/lib/*/cmake/ ===================================== debian/patches/cmake_config_file.patch ===================================== @@ -0,0 +1,16 @@ +Author: Juhani Numminen <[email protected]> +Last-Update: Tue, 05 Jan 2021 13:34:00 +0200 +Description: install CMake package config files in a multiarch-friendly path +Forwarded: https://github.com/xdf-modules/libxdf/pull/32 + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -63,7 +63,7 @@ + install(EXPORT "${PROJECT_NAME}Config" + COMPONENT ${PROJECT_NAME} + NAMESPACE "XDF::" +- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR} ++ DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/${PROJECT_NAME} + ) + + # set(CPACK_STRIP_FILES ON) ===================================== debian/patches/series ===================================== @@ -1,3 +1,2 @@ -#soversion.patch -#use_debian_packaged_pugixml.patch shared_and_static.patch +cmake_config_file.patch ===================================== debian/patches/shared_and_static.patch ===================================== @@ -1,10 +1,10 @@ Author: Andreas Tille <[email protected]> -Last-Update: Fri, 18 Dec 2020 16:56:00 +0100 +Last-Update: Tue, 05 Jan 2021 12:38:07 +0200 Description: Create shared and static library --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -26,6 +26,8 @@ set(SOURCES +@@ -26,11 +26,14 @@ ) add_library(xdf ${SOURCES}) @@ -13,7 +13,13 @@ Description: Create shared and static library find_package(pugixml 1.9 QUIET) if(TARGET pugixml AND NOT XDF_NO_SYSTEM_PUGIXML) -@@ -39,6 +41,7 @@ endif() + message(STATUS "Using system pugixml") + target_link_libraries(xdf PRIVATE pugixml) ++ target_link_libraries(xdf_shared PRIVATE pugixml::shared) + else() + message(STATUS "Using bundled pugixml") + target_sources(xdf PRIVATE pugixml/pugixml.cpp) +@@ -39,6 +42,7 @@ target_compile_features(xdf PUBLIC cxx_std_11) set_target_properties(xdf PROPERTIES OUTPUT_NAME xdf PUBLIC_HEADER xdf.h) @@ -21,7 +27,7 @@ Description: Create shared and static library target_include_directories(xdf PUBLIC $<BUILD_INTERFACE:${CMAKE_CURRENT_LIST_DIR}> $<INSTALL_INTERFACE:include> -@@ -50,6 +53,12 @@ install(TARGETS xdf +@@ -50,6 +54,12 @@ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} ) ===================================== debian/patches/soversion.patch deleted ===================================== @@ -1,14 +0,0 @@ -Author: Andreas Tille <[email protected]> -Last-Update: Wed, 16 Jan 2019 11:23:20 +0100 -Description: Add SOVERSION - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -25,6 +25,7 @@ set(SOURCES - - add_library(xdf-static STATIC ${SOURCES}) - add_library(xdf-shared SHARED ${SOURCES}) -+set_target_properties(xdf-shared PROPERTIES SOVERSION 0) - - set_property(TARGET xdf-static xdf-shared PROPERTY CXX_STANDARD 11) - set_property(TARGET xdf-static xdf-shared PROPERTY C_STANDARD 99) ===================================== debian/patches/use_debian_packaged_pugixml.patch deleted ===================================== @@ -1,37 +0,0 @@ -Author: Andreas Tille <[email protected]> -Last-Update: Wed, 16 Jan 2019 11:23:20 +0100 -Description: Use Debian packaged pugixml - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -6,9 +6,6 @@ project(libxdf) - set(SOURCES - xdf.h - xdf.cpp -- pugixml/pugiconfig.hpp -- pugixml/pugixml.hpp -- pugixml/pugixml.cpp - smarc/filtering.h - smarc/filtering.c - smarc/multi_stage.h -@@ -27,6 +24,9 @@ add_library(xdf-static STATIC ${SOURCES} - add_library(xdf-shared SHARED ${SOURCES}) - set_target_properties(xdf-shared PROPERTIES SOVERSION 0) - -+target_link_libraries(xdf-static "pugixml") -+target_link_libraries(xdf-shared "pugixml") -+ - set_property(TARGET xdf-static xdf-shared PROPERTY CXX_STANDARD 11) - set_property(TARGET xdf-static xdf-shared PROPERTY C_STANDARD 99) - set_target_properties(xdf-static PROPERTIES OUTPUT_NAME xdf) ---- a/xdf.cpp -+++ b/xdf.cpp -@@ -20,7 +20,7 @@ - - #include <iostream> - #include <fstream> --#include "pugixml/pugixml.hpp" //pugi XML parser -+#include <pugixml.hpp> //pugi XML parser - #include <sstream> - #include <algorithm> - #include "smarc/smarc.h" //resampling library ===================================== debian/rules ===================================== @@ -11,8 +11,4 @@ override_dh_install: --multiarch \ --devunversioned \ --exclude-la \ - --movedev debian/tmp/usr/include usr \ - --movedev debian/tmp/usr/share/libxdfConfig.cmake usr/lib/$(DEB_HOST_MULTIARCH)/cmake \ debian/tmp/usr/lib/*/*.so - # No idea whether this is needed in user installations - but the name sounds strange - find debian -name libxdfConfig-none.cmake -delete View it on GitLab: https://salsa.debian.org/med-team/libxdf/-/compare/55de4bd020c9048b7e2506a529609777cc796ff6...6bf90eaf93d05a411a986ef96f4e1266469193f9 -- View it on GitLab: https://salsa.debian.org/med-team/libxdf/-/compare/55de4bd020c9048b7e2506a529609777cc796ff6...6bf90eaf93d05a411a986ef96f4e1266469193f9 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
