[ros-geometry] 03/05: Rebase patches
Jochen Sprickerhof
jspricke at moszumanska.debian.org
Sat Dec 23 21:23:02 UTC 2017
This is an automated email from the git hooks/post-receive script.
jspricke pushed a commit to branch master
in repository ros-geometry.
commit dd6336964e27c4f19b331d4e1383f1f3a6cf59c1
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date: Sat Dec 23 20:25:15 2017 +0100
Rebase patches
---
.../patches/0002-Deleted-unneeded-dependency.patch | 49 -----------------
.../patches/0003-Add-Debian-specific-SONAME.patch | 24 ++++-----
.../patches/0003-Remove-unneeded-dependeny.patch | 61 ++++++++++++++++++++++
debian/patches/series | 2 +-
4 files changed, 74 insertions(+), 62 deletions(-)
diff --git a/debian/patches/0002-Deleted-unneeded-dependency.patch b/debian/patches/0002-Deleted-unneeded-dependency.patch
deleted file mode 100644
index d684f31..0000000
--- a/debian/patches/0002-Deleted-unneeded-dependency.patch
+++ /dev/null
@@ -1,49 +0,0 @@
-From: Leopold Palomo-Avellaneda <leopold.palomo at upc.edu>
-Date: Thu, 30 Apr 2015 08:46:32 +0200
-Subject: Deleted unneeded dependency
-
----
- eigen_conversions/CMakeLists.txt | 2 +-
- kdl_conversions/CMakeLists.txt | 2 +-
- tf_conversions/CMakeLists.txt | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/eigen_conversions/CMakeLists.txt b/eigen_conversions/CMakeLists.txt
-index 719e5da..adb057a 100644
---- a/eigen_conversions/CMakeLists.txt
-+++ b/eigen_conversions/CMakeLists.txt
-@@ -21,7 +21,7 @@ add_library(${PROJECT_NAME}
- src/eigen_msg.cpp
- src/eigen_kdl.cpp
- )
--add_dependencies(${PROJECT_NAME} geometry_msgs_gencpp)
-+#add_dependencies(${PROJECT_NAME} geometry_msgs_gencpp)
- target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES})
-
- install(DIRECTORY include/${PROJECT_NAME}/
-diff --git a/kdl_conversions/CMakeLists.txt b/kdl_conversions/CMakeLists.txt
-index 2f833bd..e22b653 100644
---- a/kdl_conversions/CMakeLists.txt
-+++ b/kdl_conversions/CMakeLists.txt
-@@ -17,7 +17,7 @@ link_directories(${orocos_kdl_LIBRARY_DIRS})
- add_library(${PROJECT_NAME}
- src/kdl_msg.cpp
- )
--add_dependencies(${PROJECT_NAME} geometry_msgs_gencpp)
-+#add_dependencies(${PROJECT_NAME} geometry_msgs_gencpp)
- target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES})
-
- install(DIRECTORY include/${PROJECT_NAME}/
-diff --git a/tf_conversions/CMakeLists.txt b/tf_conversions/CMakeLists.txt
-index 9c92e83..efdc0ce 100644
---- a/tf_conversions/CMakeLists.txt
-+++ b/tf_conversions/CMakeLists.txt
-@@ -24,7 +24,7 @@ add_library(${PROJECT_NAME}
- src/tf_kdl.cpp
- src/tf_eigen.cpp
- )
--add_dependencies(${PROJECT_NAME} geometry_msgs_gencpp)
-+#add_dependencies(${PROJECT_NAME} geometry_msgs_gencpp)
- target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES})
-
- # Tests
diff --git a/debian/patches/0003-Add-Debian-specific-SONAME.patch b/debian/patches/0003-Add-Debian-specific-SONAME.patch
index 746000b..dae5b9f 100644
--- a/debian/patches/0003-Add-Debian-specific-SONAME.patch
+++ b/debian/patches/0003-Add-Debian-specific-SONAME.patch
@@ -10,48 +10,48 @@ Subject: Add Debian specific SONAME
4 files changed, 4 insertions(+)
diff --git a/eigen_conversions/CMakeLists.txt b/eigen_conversions/CMakeLists.txt
-index adb057a..9cad39f 100644
+index 5277aea..244d1ee 100644
--- a/eigen_conversions/CMakeLists.txt
+++ b/eigen_conversions/CMakeLists.txt
@@ -23,6 +23,7 @@ add_library(${PROJECT_NAME}
)
- #add_dependencies(${PROJECT_NAME} geometry_msgs_gencpp)
+ add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES})
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${eigen_conversions_VERSION} SOVERSION "0d")
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
diff --git a/kdl_conversions/CMakeLists.txt b/kdl_conversions/CMakeLists.txt
-index e22b653..83927c6 100644
+index 82ac1fc..43e20f2 100644
--- a/kdl_conversions/CMakeLists.txt
+++ b/kdl_conversions/CMakeLists.txt
@@ -19,6 +19,7 @@ add_library(${PROJECT_NAME}
)
- #add_dependencies(${PROJECT_NAME} geometry_msgs_gencpp)
+ add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES})
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${kdl_conversions_VERSION} SOVERSION "0d")
install(DIRECTORY include/${PROJECT_NAME}/
DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION})
diff --git a/tf/CMakeLists.txt b/tf/CMakeLists.txt
-index 8077561..2988415 100644
+index 8429516..5a85705 100644
--- a/tf/CMakeLists.txt
+++ b/tf/CMakeLists.txt
-@@ -27,6 +27,7 @@ catkin_package(
-
- add_library(${PROJECT_NAME} src/tf.cpp src/transform_listener.cpp src/cache.cpp src/transform_broadcaster.cpp)
+@@ -42,6 +42,7 @@ add_library(${PROJECT_NAME}
+ )
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES})
+ add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${tf_VERSION} SOVERSION "0d")
- add_dependencies(${PROJECT_NAME} ${PROJECT_NAME}_gencpp)
# Debug
+ add_executable(tf_empty_listener src/empty_listener.cpp)
diff --git a/tf_conversions/CMakeLists.txt b/tf_conversions/CMakeLists.txt
-index efdc0ce..7fe299f 100644
+index 543bbdb..449ab85 100644
--- a/tf_conversions/CMakeLists.txt
+++ b/tf_conversions/CMakeLists.txt
-@@ -26,6 +26,7 @@ add_library(${PROJECT_NAME}
+@@ -25,6 +25,7 @@ add_library(${PROJECT_NAME}
)
- #add_dependencies(${PROJECT_NAME} geometry_msgs_gencpp)
+ add_dependencies(${PROJECT_NAME} ${catkin_EXPORTED_TARGETS})
target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${orocos_kdl_LIBRARIES})
+set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${tf_conversions_VERSION} SOVERSION "0d")
diff --git a/debian/patches/0003-Remove-unneeded-dependeny.patch b/debian/patches/0003-Remove-unneeded-dependeny.patch
new file mode 100644
index 0000000..61314a9
--- /dev/null
+++ b/debian/patches/0003-Remove-unneeded-dependeny.patch
@@ -0,0 +1,61 @@
+From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
+Date: Sat, 23 Dec 2017 22:03:46 +0100
+Subject: Remove unneeded dependeny
+
+---
+ eigen_conversions/CMakeLists.txt | 2 +-
+ eigen_conversions/package.xml | 1 -
+ tf_conversions/CMakeLists.txt | 2 +-
+ tf_conversions/package.xml | 1 -
+ 4 files changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/eigen_conversions/CMakeLists.txt b/eigen_conversions/CMakeLists.txt
+index 244d1ee..53251bc 100644
+--- a/eigen_conversions/CMakeLists.txt
++++ b/eigen_conversions/CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
+ project(eigen_conversions)
+
+ find_package(orocos_kdl REQUIRED)
+-find_package(catkin REQUIRED cmake_modules geometry_msgs std_msgs)
++find_package(catkin REQUIRED geometry_msgs std_msgs)
+ find_package(Eigen3 REQUIRED)
+
+ include_directories(SYSTEM ${EIGEN3_INCLUDE_DIRS})
+diff --git a/eigen_conversions/package.xml b/eigen_conversions/package.xml
+index f67834e..ecb56c0 100644
+--- a/eigen_conversions/package.xml
++++ b/eigen_conversions/package.xml
+@@ -17,7 +17,6 @@
+
+ <buildtool_depend>catkin</buildtool_depend>
+
+- <build_depend>cmake_modules</build_depend>
+ <build_depend>geometry_msgs</build_depend>
+ <build_depend>eigen</build_depend>
+ <build_depend>orocos_kdl</build_depend>
+diff --git a/tf_conversions/CMakeLists.txt b/tf_conversions/CMakeLists.txt
+index 449ab85..32aee27 100644
+--- a/tf_conversions/CMakeLists.txt
++++ b/tf_conversions/CMakeLists.txt
+@@ -2,7 +2,7 @@ cmake_minimum_required(VERSION 2.8)
+ project(tf_conversions)
+
+ find_package(orocos_kdl REQUIRED)
+-find_package(catkin REQUIRED cmake_modules geometry_msgs kdl_conversions tf)
++find_package(catkin REQUIRED geometry_msgs kdl_conversions tf)
+ find_package(Eigen3 REQUIRED)
+
+ catkin_python_setup()
+diff --git a/tf_conversions/package.xml b/tf_conversions/package.xml
+index ceea853..90fdd0d 100644
+--- a/tf_conversions/package.xml
++++ b/tf_conversions/package.xml
+@@ -21,7 +21,6 @@ the next major release cycle (see roadmap).
+
+ <buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
+
+- <build_depend>cmake_modules</build_depend>
+ <build_depend>eigen</build_depend>
+ <build_depend>geometry_msgs</build_depend>
+ <build_depend>kdl_conversions</build_depend>
diff --git a/debian/patches/series b/debian/patches/series
index cd64645..6ff2220 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
0001-Added-CMakeLists-to-build-thepackage.patch
-0002-Deleted-unneeded-dependency.patch
0003-Add-Debian-specific-SONAME.patch
+0003-Remove-unneeded-dependeny.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-geometry.git
More information about the debian-science-commits
mailing list