From a5ea27d761a7ec04359ebf951f8a24b36705cd96 Mon Sep 17 00:00:00 2001 From: Wei-Cheng Pan Date: Fri, 21 Aug 2015 20:35:59 +0800 Subject: [PATCH 1/2] fix multiarch install path --- debian/patches/fix-multiarch.patch | 22 ++++++++++++++++++++++ debian/patches/series | 1 + debian/rules | 5 +++++ 3 files changed, 28 insertions(+) create mode 100644 debian/patches/fix-multiarch.patch create mode 100644 debian/patches/series diff --git a/debian/patches/fix-multiarch.patch b/debian/patches/fix-multiarch.patch new file mode 100644 index 0000000..76dab46 --- /dev/null +++ b/debian/patches/fix-multiarch.patch @@ -0,0 +1,22 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -3,7 +3,7 @@ + project(libsysstat) + + # Set default installation paths +-set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries") ++set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries") + set(INCLUDE_INSTALL_DIR include CACHE PATH "Installation path for includes") + + set(MAJOR_VERSION 0) +--- a/cmake/create_pkgconfig_file.cmake ++++ b/cmake/create_pkgconfig_file.cmake +@@ -28,7 +28,7 @@ + if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") + install(FILES ${_pkgfname} DESTINATION libdata/pkgconfig) + else() +- install(FILES ${_pkgfname} DESTINATION lib${LIB_SUFFIX}/pkgconfig) ++ install(FILES ${_pkgfname} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) + endif() + + endmacro() diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..665487f --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +fix-multiarch.patch diff --git a/debian/rules b/debian/rules index 5ac5d96..fe7b432 100755 --- a/debian/rules +++ b/debian/rules @@ -7,6 +7,11 @@ dh ${@} --buildsystem cmake --parallel +override_dh_auto_configure: + dh_auto_configure -- \ + -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) + + override_dh_install: dh_install --list-missing --fail-missing From 0f729922fd5efc991254997b64fcd6e13af6b0ad Mon Sep 17 00:00:00 2001 From: Wei-Cheng Pan Date: Fri, 21 Aug 2015 16:50:04 +0800 Subject: [PATCH 2/2] do not install files that do not exist --- debian/libsysstat-qt5-0-dev.install | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/debian/libsysstat-qt5-0-dev.install b/debian/libsysstat-qt5-0-dev.install index 95f48c4..8af9f8c 100644 --- a/debian/libsysstat-qt5-0-dev.install +++ b/debian/libsysstat-qt5-0-dev.install @@ -4,7 +4,4 @@ usr/lib/*/libsysstat-qt5.so usr/lib/*/pkgconfig/sysstat-qt5.pc usr/share/cmake/sysstat-qt5/sysstat-qt5-config.cmake -usr/share/cmake/sysstat-qt5/sysstat-qt5-config-version.cmake -usr/share/cmake/sysstat-qt5/sysstat-qt5-targets.cmake -usr/share/cmake/sysstat-qt5/sysstat-qt5-targets-none.cmake - +usr/share/cmake/sysstat-qt5/sysstat_use.cmake