Package: libfreerdp-dev Version: 1.1.0~git20140921.1.440916e+dfsg1-4 Severity: grave Tags: patch Justification: renders package unusable
The various freerdp packages are now multi-arch and the headers are installed in /usr/include/x86_64-linux-gnu/. However, the includedir variable in freerdp.pc is set to "/usr/include/" instead of "/usr/include/x86_64-linux-gnu/". Please find attached a modified version of the patch debian/patches/1003_multi- arch-include-path.patch to fix this problem. -- System Information: Debian Release: 8.1 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'stable') Architecture: amd64 (x86_64) Foreign Architectures: i386 Kernel: Linux 3.16.0-4-amd64 (SMP w/1 CPU core) Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash Init: systemd (via /run/systemd/system) Versions of packages libfreerdp-dev depends on: ii libfreerdp-cache1.1 1.1.0~git20140921.1.440916e+dfsg1-4 ii libfreerdp-client1.1 1.1.0~git20140921.1.440916e+dfsg1-4 ii libfreerdp-codec1.1 1.1.0~git20140921.1.440916e+dfsg1-4 ii libfreerdp-common1.1.0 1.1.0~git20140921.1.440916e+dfsg1-4 ii libfreerdp-core1.1 1.1.0~git20140921.1.440916e+dfsg1-4 ii libfreerdp-crypto1.1 1.1.0~git20140921.1.440916e+dfsg1-4 ii libfreerdp-gdi1.1 1.1.0~git20140921.1.440916e+dfsg1-4 ii libfreerdp-locale1.1 1.1.0~git20140921.1.440916e+dfsg1-4 ii libfreerdp-primitives1.1 1.1.0~git20140921.1.440916e+dfsg1-4 ii libfreerdp-rail1.1 1.1.0~git20140921.1.440916e+dfsg1-4 ii libfreerdp-utils1.1 1.1.0~git20140921.1.440916e+dfsg1-4 ii libwinpr-dev 1.1.0~git20140921.1.440916e+dfsg1-4 ii libxfreerdp-client1.1 1.1.0~git20140921.1.440916e+dfsg1-4 libfreerdp-dev recommends no packages. libfreerdp-dev suggests no packages. -- no debconf information
Description: Make include path configurable for multi-arch installation targets Author: Mike Gabriel <[email protected]> --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -398,6 +398,7 @@ # Path to put plugins set(FREERDP_LIBRARY_PATH "${CMAKE_INSTALL_LIBDIR}") +set(FREERDP_INCLUDE_PATH "${CMAKE_INSTALL_INCLUDEDIR}") set(FREERDP_PLUGIN_PATH "${CMAKE_INSTALL_LIBDIR}/freerdp") set(FREERDP_ADDIN_PATH "${FREERDP_PLUGIN_PATH}") @@ -408,6 +409,7 @@ # Include directories include_directories(${CMAKE_CURRENT_BINARY_DIR}) include_directories(${CMAKE_CURRENT_BINARY_DIR}/include) +include_directories(${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_INSTALL_INCLUDEDIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/include) # Configure files --- a/freerdp.pc.in +++ b/freerdp.pc.in @@ -1,7 +1,7 @@ prefix=@CMAKE_INSTALL_PREFIX@ exec_prefix=@CMAKE_INSTALL_PREFIX@ libdir=@CMAKE_INSTALL_FULL_LIBDIR@ -includedir=@CMAKE_INSTALL_PREFIX@/include +includedir=@CMAKE_INSTALL_PREFIX@/@CMAKE_INSTALL_INCLUDEDIR@ Name: FreeRDP Description: A free remote desktop protocol client --- b/winpr/include/CMakeLists.txt +++ b/winpr/include/CMakeLists.txt @@ -16,4 +16,4 @@ # limitations under the License. file(GLOB WINPR_HEADERS "winpr/*.h") -install(FILES ${WINPR_HEADERS} DESTINATION include/winpr COMPONENT headers) +install(FILES ${WINPR_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/winpr COMPONENT headers) --- a/include/CMakeLists.txt +++ b/include/CMakeLists.txt @@ -20,16 +20,16 @@ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/freerdp/version.h.in ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h) file(GLOB FREERDP_HEADERS "freerdp/*.h") -install(FILES ${FREERDP_HEADERS} DESTINATION include/freerdp COMPONENT headers) -install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h DESTINATION include/freerdp COMPONENT headers) +install(FILES ${FREERDP_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers) +install(FILES ${CMAKE_CURRENT_BINARY_DIR}/freerdp/version.h DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers) -install(DIRECTORY freerdp/cache DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/codec DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/crypto DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/gdi DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/locale DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/rail DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/utils DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/client DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/server DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") -install(DIRECTORY freerdp/channels DESTINATION include/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/cache DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/codec DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/crypto DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/gdi DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/locale DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/rail DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/utils DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/client DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/server DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h") +install(DIRECTORY freerdp/channels DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/freerdp COMPONENT headers FILES_MATCHING PATTERN "*.h")
