[ros-geometric-shapes] 02/04: Rebase patches

[Jochen Sprickerhof]

This is an automated email from the git hooks/post-receive script.

jspricke pushed a commit to branch master
in repository ros-geometric-shapes.

commit 0f0f775bd41627ac7f8483089b8584ebcbd6117b
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Fri Sep 2 12:07:51 2016 +0200

    Rebase patches
---
 .../0001-Add-Debian-specific-SOVERSION.patch       | 19 ++++++------------
 ...-catkin-variables-for-install-destination.patch | 23 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 6 insertions(+), 37 deletions(-)

diff --git a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
index c098d12..65a71e5 100644
--- a/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0001-Add-Debian-specific-SOVERSION.patch
@@ -3,25 +3,18 @@ Date: Wed, 5 Aug 2015 08:44:03 +0200
 Subject: Add Debian specific SOVERSION
 
 ---
- CMakeLists.txt | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9ae6b09..da0181f 100644
+index 1fab981..e8c7771 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -65,6 +65,7 @@ add_library(${PROJECT_NAME}
-   src/shape_to_marker.cpp
-   src/shape_extents.cpp)
+@@ -68,6 +68,7 @@ add_library(${PROJECT_NAME}
+ )
+ 
  target_link_libraries(${PROJECT_NAME} ${ASSIMP_LIBRARIES} ${QHULL_LIBRARIES} ${catkin_LIBRARIES} ${console_bridge_LIBRARIES} ${Boost_LIBRARIES})
 +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${geometric_shapes_VERSION} SOVERSION "0d")
  
  
  if(CATKIN_ENABLE_TESTING)
-@@ -78,4 +79,4 @@ install(TARGETS ${PROJECT_NAME}
- 
- install(DIRECTORY include/
-         DESTINATION include
--        FILES_MATCHING PATTERN "*.h")
-\ No newline at end of file
-+        FILES_MATCHING PATTERN "*.h")
diff --git a/debian/patches/0002-Use-catkin-variables-for-install-destination.patch b/debian/patches/0002-Use-catkin-variables-for-install-destination.patch
deleted file mode 100644
index f16654c..0000000
--- a/debian/patches/0002-Use-catkin-variables-for-install-destination.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Sun, 22 Nov 2015 20:01:26 +0100
-Subject: Use catkin variables for install destination
-
----
- CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index da0181f..5f5a5a5 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -74,8 +74,8 @@ if(CATKIN_ENABLE_TESTING)
- endif()
- 
- install(TARGETS ${PROJECT_NAME}
--        ARCHIVE DESTINATION lib
--        LIBRARY DESTINATION lib)
-+        ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
-+        LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION})
- 
- install(DIRECTORY include/
-         DESTINATION include
diff --git a/debian/patches/series b/debian/patches/series
index 56e35b2..6eac731 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 0001-Add-Debian-specific-SOVERSION.patch
-0002-Use-catkin-variables-for-install-destination.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/ros/ros-geometric-shapes.git