diff -Nru choreonoid-1.1.0+dfsg/debian/changelog choreonoid-1.1.0+dfsg/debian/changelog --- choreonoid-1.1.0+dfsg/debian/changelog 2013-09-26 06:25:11.000000000 +0100 +++ choreonoid-1.1.0+dfsg/debian/changelog 2014-02-02 22:30:58.000000000 +0000 @@ -1,3 +1,11 @@ +choreonoid (1.1.0+dfsg-6.1) unstable; urgency=low + + * Non-maintainer upload. + * Install binary and libraries also when CMAKE_BUILD_TYPE=None, + as used by new dh. Closes: #735891. + + -- Rebecca Palmer <r.pal...@bham.ac.uk> Sun, 02 Feb 2014 22:23:06 +0000 + choreonoid (1.1.0+dfsg-6) unstable; urgency=low * Remove debian/libcnoid1.symbols (Closes: #708991, #713355) diff -Nru choreonoid-1.1.0+dfsg/debian/patches/0004-Install-choreonoid-program-always.patch choreonoid-1.1.0+dfsg/debian/patches/0004-Install-choreonoid-program-always.patch --- choreonoid-1.1.0+dfsg/debian/patches/0004-Install-choreonoid-program-always.patch 1970-01-01 01:00:00.000000000 +0100 +++ choreonoid-1.1.0+dfsg/debian/patches/0004-Install-choreonoid-program-always.patch 2014-01-21 21:35:52.000000000 +0000 @@ -0,0 +1,22 @@ +Subject: Install choreonoid program in all build types + +Install choreonoid program in all build types, +for compatibility with newer debhelper + +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=735891 +Forwarded: not-needed (this line is commented out completely in v1.4) +Author: Thomas Moulard <thomas.moul...@gmail.com>, Rebecca Palmer +--- + src/Choreonoid/CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/Choreonoid/CMakeLists.txt b/src/Choreonoid/CMakeLists.txt +index 80d3c4c..39715b5 100644 +--- a/src/Choreonoid/CMakeLists.txt ++++ b/src/Choreonoid/CMakeLists.txt +@@ -30,4 +30,4 @@ if(MSVC) + set_target_properties(${target} PROPERTIES DEBUG_POSTFIX -debug) + endif() + +-install(TARGETS ${target} RUNTIME DESTINATION bin CONFIGURATIONS Release Debug) ++install(TARGETS ${target} RUNTIME DESTINATION bin) diff -Nru choreonoid-1.1.0+dfsg/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch choreonoid-1.1.0+dfsg/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch --- choreonoid-1.1.0+dfsg/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch 2013-09-26 00:34:56.000000000 +0100 +++ choreonoid-1.1.0+dfsg/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -From: Thomas Moulard <thomas.moul...@gmail.com> -Date: Thu, 9 May 2013 00:11:16 +0900 -Subject: Install choreonoid program when build type is RelWithDebInfo. - -Install choreonoid program when build type is RelWithDebInfo. - -Forwarded: yes -Author: Thomas Moulard <thomas.moul...@gmail.com> ---- - src/Choreonoid/CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/Choreonoid/CMakeLists.txt b/src/Choreonoid/CMakeLists.txt -index 80d3c4c..39715b5 100644 ---- a/src/Choreonoid/CMakeLists.txt -+++ b/src/Choreonoid/CMakeLists.txt -@@ -30,4 +30,4 @@ if(MSVC) - set_target_properties(${target} PROPERTIES DEBUG_POSTFIX -debug) - endif() - --install(TARGETS ${target} RUNTIME DESTINATION bin CONFIGURATIONS Release Debug) -+install(TARGETS ${target} RUNTIME DESTINATION bin CONFIGURATIONS Release Debug RelWithDebInfo) diff -Nru choreonoid-1.1.0+dfsg/debian/patches/0009-Install-libraries-always.patch choreonoid-1.1.0+dfsg/debian/patches/0009-Install-libraries-always.patch --- choreonoid-1.1.0+dfsg/debian/patches/0009-Install-libraries-always.patch 1970-01-01 01:00:00.000000000 +0100 +++ choreonoid-1.1.0+dfsg/debian/patches/0009-Install-libraries-always.patch 2014-01-21 22:40:45.000000000 +0000 @@ -0,0 +1,58 @@ +Description: Install libraries in all build types + +Install libraries in all build types, +for compatibility with newer debhelper + +Author: Rebecca Palmer +Bug-Debian: http://bugs.debian.org/735891 +Forwarded: no +--- choreonoid-1.1.0+dfsg.orig/CMakeLists.txt ++++ choreonoid-1.1.0+dfsg/CMakeLists.txt +@@ -331,20 +331,18 @@ function(apply_common_setting_for_librar + + if(INSTALL_SDK) + install(TARGETS ${target} +- RUNTIME DESTINATION bin CONFIGURATIONS Release Debug RelWithDebInfo MinSizeRel ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE} +- CONFIGURATIONS Release Debug RelWithDebInfo MinSizeRel +- ARCHIVE DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE} +- CONFIGURATIONS Release Debug RelWithDebInfo MinSizeRel) ++ ARCHIVE DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}) + if(headers) + get_filename_component(subdir ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE) + install(FILES ${headers} DESTINATION ${CNOID_HEADER_SUBDIR}/cnoid/src/${subdir}) + endif() + else() + install(TARGETS ${target} +- RUNTIME DESTINATION bin CONFIGURATIONS Release Debug RelWithDebInfo MinSizeRel ++ RUNTIME DESTINATION bin + LIBRARY DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE} +- CONFIGURATIONS Release Debug RelWithDebInfo MinSizeRel) ++ ) + endif() + + endfunction() +@@ -356,17 +354,17 @@ function(apply_common_setting_for_plugin + + if(INSTALL_SDK) + install(TARGETS ${target} +- RUNTIME DESTINATION ${CNOID_PLUGIN_SUBDIR} CONFIGURATIONS Release Debug RelWithDebInfo MinSizeRel +- LIBRARY DESTINATION ${CNOID_PLUGIN_SUBDIR} CONFIGURATIONS Release Debug RelWithDebInfo MinSizeRel +- ARCHIVE DESTINATION ${CNOID_PLUGIN_SUBDIR} CONFIGURATIONS Release Debug RelWithDebInfo MinSizeRel) ++ RUNTIME DESTINATION ${CNOID_PLUGIN_SUBDIR} ++ LIBRARY DESTINATION ${CNOID_PLUGIN_SUBDIR} ++ ARCHIVE DESTINATION ${CNOID_PLUGIN_SUBDIR}) + if(headers) + get_filename_component(subdir ${CMAKE_CURRENT_SOURCE_DIR} NAME_WE) + install(FILES ${headers} DESTINATION ${CNOID_HEADER_SUBDIR}/cnoid/src/${subdir}) + endif() + else() + install(TARGETS ${target} +- RUNTIME DESTINATION ${CNOID_PLUGIN_SUBDIR} CONFIGURATIONS Release Debug RelWithDebInfo MinSizeRel +- LIBRARY DESTINATION ${CNOID_PLUGIN_SUBDIR} CONFIGURATIONS Release Debug RelWithDebInfo MinSizeRel) ++ RUNTIME DESTINATION ${CNOID_PLUGIN_SUBDIR} ++ LIBRARY DESTINATION ${CNOID_PLUGIN_SUBDIR}) + endif() + + endfunction() diff -Nru choreonoid-1.1.0+dfsg/debian/patches/series choreonoid-1.1.0+dfsg/debian/patches/series --- choreonoid-1.1.0+dfsg/debian/patches/series 2013-09-26 00:34:56.000000000 +0100 +++ choreonoid-1.1.0+dfsg/debian/patches/series 2014-01-21 22:38:02.000000000 +0000 @@ -1,8 +1,9 @@ 0001-Fix-compilation-failure-with-recent-Boost-version.patch 0002-Prevent-moc-qt-from-analyzing-Boost-headers.patch 0003-Fix-multiarchi-support.patch -0004-Install-choreonoid-program-when-build-type-is-RelWit.patch +0004-Install-choreonoid-program-always.patch 0005-Install-pkg-config-file-in-lib-arch-directory.patch 0006-Port-to-Boost-Filesystem-v3.patch 0007-Fix-cast-from-pointer-to-udword-losing-precision.patch 0008-Fix-OpenSceneGraph-compilation-issues.patch +0009-Install-libraries-always.patch
Attached is a proposed NMU that fixes this bug (identical to the above
patch other than adding the changelog entry). Please let us know if you
do not want this; if you remain silent, it is likely to be uploaded
without further warning.
- Bug#735891: intent to NMU #735891 FTBFS: dh_install: cho... Rebecca N. Palmer
- Bug#735891: intent to NMU #735891 FTBFS: dh_install... Thomas Moulard
- Bug#735891: intent to NMU #735891 FTBFS: dh_ins... Andreas Beckmann
