Control: tags -1 patch
This bug also exists on amd64 in current sid, and the attached patch
appears to fix it (builds and has the same file list as the current
package, except for choreonoid-doc where doxygen has changed its naming
convention; I haven't tried running it).
commit a316937c9b2e26e45b2912c1d5070a09edf502b0
Author: Rebecca Palmer <r.pal...@bham.ac.uk>
Date: Tue Jan 21 22:44:41 2014 +0000
Install also when CMAKE_BUILD_TYPE=None, as set by new dh. Closes: #735891.
diff --git a/debian/patches/0004-Install-choreonoid-program-always.patch b/debian/patches/0004-Install-choreonoid-program-always.patch
new file mode 100644
index 0000000..0521684
--- /dev/null
+++ b/debian/patches/0004-Install-choreonoid-program-always.patch
@@ -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 --git a/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch b/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch
deleted file mode 100644
index 80e71d6..0000000
--- a/debian/patches/0004-Install-choreonoid-program-when-build-type-is-RelWit.patch
+++ /dev/null
@@ -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 --git a/debian/patches/0009-Install-libraries-always.patch b/debian/patches/0009-Install-libraries-always.patch
new file mode 100644
index 0000000..8d0a727
--- /dev/null
+++ b/debian/patches/0009-Install-libraries-always.patch
@@ -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 --git a/debian/patches/series b/debian/patches/series
index 053ebe8..4bb7981 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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
