diff -Nru choreonoid-roki-plugin-1.0.0ubuntu1+20160909+672+3~ubuntu15.04.1/CMakeLists.txt choreonoid-roki-plugin-1.0.0ubuntu1+20160912+674+3~ubuntu15.04.1/CMakeLists.txt --- choreonoid-roki-plugin-1.0.0ubuntu1+20160909+672+3~ubuntu15.04.1/CMakeLists.txt 2016-09-09 05:32:07.000000000 +0000 +++ choreonoid-roki-plugin-1.0.0ubuntu1+20160912+674+3~ubuntu15.04.1/CMakeLists.txt 2016-09-12 13:32:44.000000000 +0000 @@ -6,12 +6,6 @@ include(FindPkgConfig) include(CheckIncludeFiles) - -if(UNIX) - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") - add_definitions("-pthread") -endif() - project(Choreonoid) # set(CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake_modules/) @@ -30,6 +24,11 @@ set(CNOID_SUBDIR choreonoid-${CNOID_VERSION}) set(CNOID_PLUGIN_SUBDIR lib/${CNOID_SUBDIR}) +if(UNIX) + SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++11") + add_definitions("-pthread") +endif() + if(WIN32) set(CNOID_HEADER_SUBDIR "include") set(CNOID_SHARE_SUBDIR "share") diff -Nru choreonoid-roki-plugin-1.0.0ubuntu1+20160909+672+3~ubuntu15.04.1/debian/bzr-builder.manifest choreonoid-roki-plugin-1.0.0ubuntu1+20160912+674+3~ubuntu15.04.1/debian/bzr-builder.manifest --- choreonoid-roki-plugin-1.0.0ubuntu1+20160909+672+3~ubuntu15.04.1/debian/bzr-builder.manifest 2016-09-09 05:32:11.000000000 +0000 +++ choreonoid-roki-plugin-1.0.0ubuntu1+20160912+674+3~ubuntu15.04.1/debian/bzr-builder.manifest 2016-09-12 13:32:50.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}+20160909+672+3 -lp:~hrg/hrg-packaging/choreonoid revid:git-v1:325d8c36355a495ba49dc8f3e51d7b8bc49937d4 +# bzr-builder format 0.3 deb-version {debupstream}+20160912+674+3 +lp:~hrg/hrg-packaging/choreonoid revid:git-v1:314c4d47f6251107c0a2be902ca21663a7844773 nest-part packaging lp:~hrg/hrg-packaging/choreonoid-roki-plugin-deb debian debian revid:f-kanehiro@aist.go.jp-20160715044433-y5calyfmwsoohy2i diff -Nru choreonoid-roki-plugin-1.0.0ubuntu1+20160909+672+3~ubuntu15.04.1/debian/changelog choreonoid-roki-plugin-1.0.0ubuntu1+20160912+674+3~ubuntu15.04.1/debian/changelog --- choreonoid-roki-plugin-1.0.0ubuntu1+20160909+672+3~ubuntu15.04.1/debian/changelog 2016-09-09 05:32:11.000000000 +0000 +++ choreonoid-roki-plugin-1.0.0ubuntu1+20160912+674+3~ubuntu15.04.1/debian/changelog 2016-09-12 13:32:50.000000000 +0000 @@ -1,8 +1,8 @@ -choreonoid-roki-plugin (1.0.0ubuntu1+20160909+672+3~ubuntu15.04.1) vivid; urgency=low +choreonoid-roki-plugin (1.0.0ubuntu1+20160912+674+3~ubuntu15.04.1) vivid; urgency=low * Auto build. - -- Launchpad Package Builder Fri, 09 Sep 2016 05:32:11 +0000 + -- Launchpad Package Builder Mon, 12 Sep 2016 13:32:50 +0000 choreonoid-roki-plugin (1.0.0ubuntu1) UNRELEASED; urgency=medium diff -Nru choreonoid-roki-plugin-1.0.0ubuntu1+20160909+672+3~ubuntu15.04.1/sample/Roki/Arm2dofController.cpp choreonoid-roki-plugin-1.0.0ubuntu1+20160912+674+3~ubuntu15.04.1/sample/Roki/Arm2dofController.cpp --- choreonoid-roki-plugin-1.0.0ubuntu1+20160909+672+3~ubuntu15.04.1/sample/Roki/Arm2dofController.cpp 2016-09-09 05:32:07.000000000 +0000 +++ choreonoid-roki-plugin-1.0.0ubuntu1+20160912+674+3~ubuntu15.04.1/sample/Roki/Arm2dofController.cpp 2016-09-12 13:32:44.000000000 +0000 @@ -5,7 +5,6 @@ using namespace std; using namespace cnoid; -using namespace boost; #define ROKISAMPLE #define DOF (2)