[urdfdom] 02/04: Remove patches already merged upstream.
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Wed Dec 4 02:09:43 UTC 2013
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository urdfdom.
commit db98b7b80a88cc752565e4bd7888f6137dba594f
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Wed Dec 4 01:34:32 2013 +0000
Remove patches already merged upstream.
Thomas Moulard did all the job committing all the patches into upstream
code.
---
...lled-CMake-module-to-cope-with-multiarch.patch} | 0
debian/patches/0001-Look-for-Boost-System.patch | 21 ---
.../0002-Add-GNUInstallDirs-CMakeLists.txt.patch | 63 ---------
debian/patches/0003-Clean-generated-files.patch | 20 ---
debian/patches/0004-Add-SOVERSION.patch | 32 -----
debian/patches/0005-Add-visibility-support.patch | 157 ---------------------
.../0006-Generate-files-in-build-directory.patch | 42 ------
debian/patches/series | 8 +-
8 files changed, 1 insertion(+), 342 deletions(-)
diff --git a/debian/patches/0007-Fix-installed-CMake-module-to-cope-with-multiarch.patch b/debian/patches/0001-Fix-installed-CMake-module-to-cope-with-multiarch.patch
similarity index 100%
rename from debian/patches/0007-Fix-installed-CMake-module-to-cope-with-multiarch.patch
rename to debian/patches/0001-Fix-installed-CMake-module-to-cope-with-multiarch.patch
diff --git a/debian/patches/0001-Look-for-Boost-System.patch b/debian/patches/0001-Look-for-Boost-System.patch
deleted file mode 100644
index 5e70d5c..0000000
--- a/debian/patches/0001-Look-for-Boost-System.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Wed, 3 Jul 2013 13:17:11 +0900
-Subject: Look for Boost System.
-
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7878323..9ff88a3 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -34,7 +34,7 @@ find_package(console_bridge REQUIRED)
- include_directories(SYSTEM ${console_bridge_INCLUDE_DIRS})
- link_directories(${console_bridge_LIBRARY_DIRS})
-
--find_package(Boost REQUIRED thread)
-+find_package(Boost REQUIRED system thread)
- include_directories(${Boost_INCLUDE_DIR})
- link_directories(${Boost_LIBRARY_DIRS})
-
diff --git a/debian/patches/0002-Add-GNUInstallDirs-CMakeLists.txt.patch b/debian/patches/0002-Add-GNUInstallDirs-CMakeLists.txt.patch
deleted file mode 100644
index 240500b..0000000
--- a/debian/patches/0002-Add-GNUInstallDirs-CMakeLists.txt.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Wed, 3 Jul 2013 13:20:48 +0900
-Subject: Add GNUInstallDirs CMakeLists.txt
-
----
- CMakeLists.txt | 8 ++++++--
- urdf_parser/CMakeLists.txt | 13 +++++++------
- 2 files changed, 13 insertions(+), 8 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9ff88a3..3d9e517 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -9,6 +9,8 @@ set (URDF_VERSION ${URDF_MAJOR_VERSION}.${URDF_MINOR_VERSION}.${URDF_PATCH_VERSI
-
- message (STATUS "${PROJECT_NAME} version ${URDF_VERSION}")
-
-+include(GNUInstallDirs)
-+
- # set the default build type
- if (NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE Release)
-@@ -45,7 +47,8 @@ set(PKG_LIBRARIES urdfdom_sensor urdfdom_model_state urdfdom_model urdfdom_world
- set(PKG_DEPENDS urdfdom_headers console_bridge)
- set(cmake_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/cmake/urdfdom-config.cmake")
- configure_file("${cmake_conf_file}.in" "${cmake_conf_file}" @ONLY)
--install(FILES ${cmake_conf_file} DESTINATION share/${PROJECT_NAME}/cmake/ COMPONENT cmake)
-+install(FILES ${cmake_conf_file}
-+ DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake/ COMPONENT cmake)
-
- # Make the package config file
- if (NOT MSVC)
-@@ -54,7 +57,8 @@ if (NOT MSVC)
- set(PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model_state -lurdfdom_model -lurdfdom_world")
- set(pkg_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig/urdfdom.pc")
- configure_file("${pkg_conf_file}.in" "${pkg_conf_file}" @ONLY)
-- install(FILES ${pkg_conf_file} DESTINATION lib/pkgconfig/ COMPONENT pkgconfig)
-+ install(FILES ${pkg_conf_file}
-+ DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ COMPONENT pkgconfig)
- endif()
-
-
-diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
-index 85a5778..605d64c 100644
---- a/urdf_parser/CMakeLists.txt
-+++ b/urdf_parser/CMakeLists.txt
-@@ -24,9 +24,10 @@ add_executable(urdf_mem_test test/memtest.cpp)
- target_link_libraries(urdf_mem_test urdfdom_model)
-
-
--INSTALL(TARGETS urdfdom_model DESTINATION lib/)
--INSTALL(TARGETS urdfdom_world DESTINATION lib/)
--INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test DESTINATION share/${PROJECT_NAME})
--INSTALL(TARGETS urdfdom_sensor DESTINATION lib/)
--INSTALL(TARGETS urdfdom_model_state DESTINATION lib/)
--INSTALL(DIRECTORY include/urdf_parser DESTINATION include)
-+INSTALL(TARGETS urdfdom_model DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+INSTALL(TARGETS urdfdom_world DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+INSTALL(TARGETS check_urdf urdf_to_graphiz urdf_mem_test
-+ DESTINATION ${CMAKE_INSTALL_BINDIR})
-+INSTALL(TARGETS urdfdom_sensor DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+INSTALL(TARGETS urdfdom_model_state DESTINATION ${CMAKE_INSTALL_LIBDIR})
-+INSTALL(DIRECTORY include/urdf_parser DESTINATION ${CMAKE_INSTALL_INCLUDEDIR})
diff --git a/debian/patches/0003-Clean-generated-files.patch b/debian/patches/0003-Clean-generated-files.patch
deleted file mode 100644
index 8b2fcc3..0000000
--- a/debian/patches/0003-Clean-generated-files.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Wed, 3 Jul 2013 13:22:17 +0900
-Subject: Clean generated files
-
----
- CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 3d9e517..5f39fd1 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -63,3 +63,7 @@ endif()
-
-
- message(STATUS "Configuration successful. Type make to compile urdfdom")
-+
-+SET_DIRECTORY_PROPERTIES(PROPERTIES
-+ ADDITIONAL_MAKE_CLEAN_FILES cmake/urdfdom-config.cmake
-+ ADDITIONAL_MAKE_CLEAN_FILES cmake/pkgconfig/urdfdom.pc)
diff --git a/debian/patches/0004-Add-SOVERSION.patch b/debian/patches/0004-Add-SOVERSION.patch
deleted file mode 100644
index 6f7cfac..0000000
--- a/debian/patches/0004-Add-SOVERSION.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Wed, 3 Jul 2013 13:25:55 +0900
-Subject: Add SOVERSION
-
----
- urdf_parser/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/urdf_parser/CMakeLists.txt b/urdf_parser/CMakeLists.txt
-index 605d64c..cd23331 100644
---- a/urdf_parser/CMakeLists.txt
-+++ b/urdf_parser/CMakeLists.txt
-@@ -2,15 +2,19 @@ include_directories(include)
-
- add_library(urdfdom_world SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp src/world.cpp)
- target_link_libraries(urdfdom_world ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(urdfdom_world PROPERTIES SOVERSION 0.2)
-
- add_library(urdfdom_model SHARED src/pose.cpp src/model.cpp src/link.cpp src/joint.cpp)
- target_link_libraries(urdfdom_model ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(urdfdom_model PROPERTIES SOVERSION 0.2)
-
- add_library(urdfdom_sensor SHARED src/urdf_sensor.cpp)
- target_link_libraries(urdfdom_sensor urdfdom_model ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(urdfdom_sensor PROPERTIES SOVERSION 0.2)
-
- add_library(urdfdom_model_state SHARED src/urdf_model_state.cpp src/twist.cpp)
- target_link_libraries(urdfdom_model_state ${tinyxml_libraries} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
-+set_target_properties(urdfdom_model_state PROPERTIES SOVERSION 0.2)
-
- # --------------------------------
-
diff --git a/debian/patches/0005-Add-visibility-support.patch b/debian/patches/0005-Add-visibility-support.patch
deleted file mode 100644
index 1465f43..0000000
--- a/debian/patches/0005-Add-visibility-support.patch
+++ /dev/null
@@ -1,157 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Thu, 4 Jul 2013 10:54:05 +0900
-Subject: Add visibility support.
-
----
- CMakeLists.txt | 7 +++
- urdf_parser/include/urdf_parser/exportdecl.h | 84 +++++++++++++++++++++++++++
- urdf_parser/include/urdf_parser/urdf_parser.h | 20 ++++---
- 3 files changed, 102 insertions(+), 9 deletions(-)
- create mode 100644 urdf_parser/include/urdf_parser/exportdecl.h
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 5f39fd1..7052527 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -16,6 +16,13 @@ if (NOT CMAKE_BUILD_TYPE)
- set(CMAKE_BUILD_TYPE Release)
- endif()
-
-+# If compiler support symbol visibility, enable it.
-+include(CheckCCompilerFlag)
-+check_c_compiler_flag(-fvisibility=hidden HAS_VISIBILITY)
-+if (HAS_VISIBILITY)
-+ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility=hidden")
-+endif()
-+
- # This shouldn't be necessary, but there has been trouble
- # with MSVC being set off, but MSVCXX ON.
- if(MSVC OR MSVC90 OR MSVC10)
-diff --git a/urdf_parser/include/urdf_parser/exportdecl.h b/urdf_parser/include/urdf_parser/exportdecl.h
-new file mode 100644
-index 0000000..af8a23b
---- /dev/null
-+++ b/urdf_parser/include/urdf_parser/exportdecl.h
-@@ -0,0 +1,84 @@
-+/*********************************************************************
-+* Software License Agreement (BSD License)
-+*
-+* Copyright (c) 2008, Willow Garage, Inc.
-+* All rights reserved.
-+*
-+* Redistribution and use in source and binary forms, with or without
-+* modification, are permitted provided that the following conditions
-+* are met:
-+*
-+* * Redistributions of source code must retain the above copyright
-+* notice, this list of conditions and the following disclaimer.
-+* * Redistributions in binary form must reproduce the above
-+* copyright notice, this list of conditions and the following
-+* disclaimer in the documentation and/or other materials provided
-+* with the distribution.
-+* * Neither the name of the Willow Garage nor the names of its
-+* contributors may be used to endorse or promote products derived
-+* from this software without specific prior written permission.
-+*
-+* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-+* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-+* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
-+* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
-+* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
-+* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
-+* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-+* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-+* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-+* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-+* ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-+* POSSIBILITY OF SUCH DAMAGE.
-+*********************************************************************/
-+
-+/* Author: Thomas Moulard */
-+
-+#ifndef URDFDOM_EXPORTDECL_H
-+# define URDFDOM_EXPORTDECL_H
-+
-+// Handle portable symbol export.
-+// Defining manually which symbol should be exported is required
-+// under Windows whether MinGW or MSVC is used.
-+//
-+// The headers then have to be able to work in two different modes:
-+// - dllexport when one is building the library,
-+// - dllimport for clients using the library.
-+//
-+// On Linux, set the visibility accordingly. If C++ symbol visibility
-+// is handled by the compiler, see: http://gcc.gnu.org/wiki/Visibility
-+# if defined _WIN32 || defined __CYGWIN__
-+// On Microsoft Windows, use dllimport and dllexport to tag symbols.
-+# define URDFDOM_DLLIMPORT __declspec(dllimport)
-+# define URDFDOM_DLLEXPORT __declspec(dllexport)
-+# define URDFDOM_DLLLOCAL
-+# else
-+// On Linux, for GCC >= 4, tag symbols using GCC extension.
-+# if __GNUC__ >= 4
-+# define URDFDOM_DLLIMPORT __attribute__ ((visibility("default")))
-+# define URDFDOM_DLLEXPORT __attribute__ ((visibility("default")))
-+# define URDFDOM_DLLLOCAL __attribute__ ((visibility("hidden")))
-+# else
-+// Otherwise (GCC < 4 or another compiler is used), export everything.
-+# define URDFDOM_DLLIMPORT
-+# define URDFDOM_DLLEXPORT
-+# define URDFDOM_DLLLOCAL
-+# endif // __GNUC__ >= 4
-+# endif // defined _WIN32 || defined __CYGWIN__
-+
-+# ifdef URDFDOM_STATIC
-+// If one is using the library statically, get rid of
-+// extra information.
-+# define URDFDOM_DLLAPI
-+# define URDFDOM_LOCAL
-+# else
-+// Depending on whether one is building or using the
-+// library define DLLAPI to import or export.
-+# ifdef console_bridge_EXPORTS
-+# define URDFDOM_DLLAPI URDFDOM_DLLEXPORT
-+# else
-+# define URDFDOM_DLLAPI URDFDOM_DLLIMPORT
-+# endif // URDFDOM_EXPORTS
-+# define URDFDOM_LOCAL URDFDOM_DLLLOCAL
-+# endif // URDFDOM_STATIC
-+#endif //! URDFDOM_EXPORTDECL_H
-diff --git a/urdf_parser/include/urdf_parser/urdf_parser.h b/urdf_parser/include/urdf_parser/urdf_parser.h
-index 29e67f3..ad9db78 100644
---- a/urdf_parser/include/urdf_parser/urdf_parser.h
-+++ b/urdf_parser/include/urdf_parser/urdf_parser.h
-@@ -44,22 +44,24 @@
- #include <urdf_model/model.h>
- #include <urdf_model/color.h>
-
-+#include "exportdecl.h"
-+
- namespace urdf_export_helpers {
-
--std::string values2str(unsigned int count, const double *values, double (*conv)(double) = NULL);
--std::string values2str(urdf::Vector3 vec);
--std::string values2str(urdf::Rotation rot);
--std::string values2str(urdf::Color c);
--std::string values2str(double d);
-+URDFDOM_DLLAPI std::string values2str(unsigned int count, const double *values, double (*conv)(double) = NULL);
-+URDFDOM_DLLAPI std::string values2str(urdf::Vector3 vec);
-+URDFDOM_DLLAPI std::string values2str(urdf::Rotation rot);
-+URDFDOM_DLLAPI std::string values2str(urdf::Color c);
-+URDFDOM_DLLAPI std::string values2str(double d);
-
- }
-
- namespace urdf{
-
-- boost::shared_ptr<ModelInterface> parseURDF(const std::string &xml_string);
-- TiXmlDocument* exportURDF(boost::shared_ptr<ModelInterface> &model);
-- TiXmlDocument* exportURDF(const ModelInterface &model);
--
-+ URDFDOM_DLLAPI boost::shared_ptr<ModelInterface> parseURDF(const std::string &xml_string);
-+ URDFDOM_DLLAPI TiXmlDocument* exportURDF(boost::shared_ptr<ModelInterface> &model);
-+ URDFDOM_DLLAPI TiXmlDocument* exportURDF(const ModelInterface &model);
-+ URDFDOM_DLLAPI bool parsePose(Pose&, TiXmlElement*);
- }
-
- #endif
diff --git a/debian/patches/0006-Generate-files-in-build-directory.patch b/debian/patches/0006-Generate-files-in-build-directory.patch
deleted file mode 100644
index e43b0b2..0000000
--- a/debian/patches/0006-Generate-files-in-build-directory.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From: Thomas Moulard <thomas.moulard at gmail.com>
-Date: Thu, 4 Jul 2013 11:41:07 +0900
-Subject: Generate files in build directory
-
----
- CMakeLists.txt | 12 ++++++------
- 1 file changed, 6 insertions(+), 6 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 7052527..84528ea 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -53,8 +53,8 @@ set(PKG_NAME ${PROJECT_NAME})
- set(PKG_LIBRARIES urdfdom_sensor urdfdom_model_state urdfdom_model urdfdom_world)
- set(PKG_DEPENDS urdfdom_headers console_bridge)
- set(cmake_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/cmake/urdfdom-config.cmake")
--configure_file("${cmake_conf_file}.in" "${cmake_conf_file}" @ONLY)
--install(FILES ${cmake_conf_file}
-+configure_file("${cmake_conf_file}.in" "${CMAKE_BINARY_DIR}/${cmake_conf_file}" @ONLY)
-+install(FILES ${CMAKE_BINARY_DIR}/${cmake_conf_file}
- DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/${PROJECT_NAME}/cmake/ COMPONENT cmake)
-
- # Make the package config file
-@@ -63,8 +63,8 @@ if (NOT MSVC)
- set(PKG_DEPENDS "urdfdom_headers console_bridge") # make the list separated by spaces instead of ;
- set(PKG_URDF_LIBS "-lurdfdom_sensor -lurdfdom_model_state -lurdfdom_model -lurdfdom_world")
- set(pkg_conf_file "${CMAKE_CURRENT_SOURCE_DIR}/cmake/pkgconfig/urdfdom.pc")
-- configure_file("${pkg_conf_file}.in" "${pkg_conf_file}" @ONLY)
-- install(FILES ${pkg_conf_file}
-+ configure_file("${pkg_conf_file}.in" "${CMAKE_BINARY_DIR}/${pkg_conf_file}" @ONLY)
-+ install(FILES ${CMAKE_BINARY_DIR}/${pkg_conf_file}
- DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig/ COMPONENT pkgconfig)
- endif()
-
-@@ -72,5 +72,5 @@ endif()
- message(STATUS "Configuration successful. Type make to compile urdfdom")
-
- SET_DIRECTORY_PROPERTIES(PROPERTIES
-- ADDITIONAL_MAKE_CLEAN_FILES cmake/urdfdom-config.cmake
-- ADDITIONAL_MAKE_CLEAN_FILES cmake/pkgconfig/urdfdom.pc)
-+ ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/cmake/urdfdom-config.cmake
-+ ADDITIONAL_MAKE_CLEAN_FILES ${CMAKE_BINARY_DIR}/cmake/pkgconfig/urdfdom.pc)
diff --git a/debian/patches/series b/debian/patches/series
index 9c27f2d..3efe86d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1 @@
-0001-Look-for-Boost-System.patch
-0002-Add-GNUInstallDirs-CMakeLists.txt.patch
-0003-Clean-generated-files.patch
-0004-Add-SOVERSION.patch
-0005-Add-visibility-support.patch
-0006-Generate-files-in-build-directory.patch
-0007-Fix-installed-CMake-module-to-cope-with-multiarch.patch
+0001-Fix-installed-CMake-module-to-cope-with-multiarch.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/urdfdom.git
More information about the debian-science-commits
mailing list