[ros-image-common] 06/07: Update patches

[Jochen Sprickerhof]

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

jspricke-guest pushed a commit to branch master
in repository ros-image-common.

commit a7ec04b4e3d21f45cdc968656e166a53666a648e
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Tue Jan 19 22:57:34 2016 +0100

    Update patches
---
 debian/patches/0001-Add-CMakeLists.txt.patch       |  4 ++--
 .../0002-Add-Debian-specific-SOVERSION.patch       |  6 ++---
 .../patches/0003-Fix-Boost-library-linking.patch   | 26 ----------------------
 ...install-target-for-python-wrapper-library.patch | 23 -------------------
 debian/patches/series                              |  2 --
 5 files changed, 5 insertions(+), 56 deletions(-)

diff --git a/debian/patches/0001-Add-CMakeLists.txt.patch b/debian/patches/0001-Add-CMakeLists.txt.patch
index a31be72..5496b16 100644
--- a/debian/patches/0001-Add-CMakeLists.txt.patch
+++ b/debian/patches/0001-Add-CMakeLists.txt.patch
@@ -9,7 +9,7 @@ Subject: Add CMakeLists.txt
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 new file mode 100644
-index 0000000..a6d5d86
+index 0000000..00b0393
 --- /dev/null
 +++ b/CMakeLists.txt
 @@ -0,0 +1,7 @@
@@ -17,6 +17,6 @@ index 0000000..a6d5d86
 +project(image_common)
 +
 +add_subdirectory(camera_calibration_parsers)
-+add_subdirectory(camera_info_manager)
 +add_subdirectory(image_transport)
++add_subdirectory(camera_info_manager)
 +add_subdirectory(polled_camera)
diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index bb35e1b..40b8ae1 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -10,15 +10,15 @@ Subject: Add Debian specific SOVERSION
  4 files changed, 4 insertions(+)
 
 diff --git a/camera_calibration_parsers/CMakeLists.txt b/camera_calibration_parsers/CMakeLists.txt
-index 98165ed..3630137 100644
+index 4f9bf6d..2848103 100644
 --- a/camera_calibration_parsers/CMakeLists.txt
 +++ b/camera_calibration_parsers/CMakeLists.txt
 @@ -41,6 +41,7 @@ add_library(${PROJECT_NAME}_wrapper
    src/parse_wrapper.cpp)
  
- target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ${Boost_LIBRARIES})
+ target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY})
 +set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${camera_calibration_parsers_VERSION} SOVERSION "0d")
- target_link_libraries(${PROJECT_NAME}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
+ target_link_libraries(${PROJECT_NAME}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES})
  
  # Don't prepend wrapper library name with lib and add to Python libs.
 diff --git a/camera_info_manager/CMakeLists.txt b/camera_info_manager/CMakeLists.txt
diff --git a/debian/patches/0003-Fix-Boost-library-linking.patch b/debian/patches/0003-Fix-Boost-library-linking.patch
deleted file mode 100644
index 69b1af8..0000000
--- a/debian/patches/0003-Fix-Boost-library-linking.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 19 Jan 2016 16:05:50 +0100
-Subject: Fix Boost library linking
-
-Boost_LIBRARIES contains now both filesystem and python which implies a
-dependency to libpython.
----
- camera_calibration_parsers/CMakeLists.txt | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/camera_calibration_parsers/CMakeLists.txt b/camera_calibration_parsers/CMakeLists.txt
-index 3630137..b3c75eb 100644
---- a/camera_calibration_parsers/CMakeLists.txt
-+++ b/camera_calibration_parsers/CMakeLists.txt
-@@ -40,9 +40,9 @@ add_library(${PROJECT_NAME}
- add_library(${PROJECT_NAME}_wrapper
-   src/parse_wrapper.cpp)
- 
--target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ${Boost_LIBRARIES})
-+target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ${Boost_FILESYSTEM_LIBRARY})
- set_target_properties(${PROJECT_NAME} PROPERTIES VERSION ${camera_calibration_parsers_VERSION} SOVERSION "0d")
--target_link_libraries(${PROJECT_NAME}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_LIBRARIES} ${PYTHON_LIBRARIES})
-+target_link_libraries(${PROJECT_NAME}_wrapper ${PROJECT_NAME} ${catkin_LIBRARIES} ${Boost_PYTHON_LIBRARY} ${PYTHON_LIBRARIES})
- 
- # Don't prepend wrapper library name with lib and add to Python libs.
- set_target_properties(${PROJECT_NAME}_wrapper PROPERTIES
diff --git a/debian/patches/0004-Add-install-target-for-python-wrapper-library.patch b/debian/patches/0004-Add-install-target-for-python-wrapper-library.patch
deleted file mode 100644
index 35edd47..0000000
--- a/debian/patches/0004-Add-install-target-for-python-wrapper-library.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From: Jochen Sprickerhof <git at jochen.sprickerhof.de>
-Date: Tue, 19 Jan 2016 16:27:27 +0100
-Subject: Add install target for python wrapper library
-
----
- camera_calibration_parsers/CMakeLists.txt | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/camera_calibration_parsers/CMakeLists.txt b/camera_calibration_parsers/CMakeLists.txt
-index b3c75eb..2848103 100644
---- a/camera_calibration_parsers/CMakeLists.txt
-+++ b/camera_calibration_parsers/CMakeLists.txt
-@@ -71,6 +71,10 @@ install(
-   DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
- )
- 
-+install(TARGETS ${PROJECT_NAME}_wrapper
-+  DESTINATION ${CATKIN_PACKAGE_PYTHON_DESTINATION}
-+)
-+
- if(CATKIN_ENABLE_TESTING)
-   add_subdirectory(test)
- endif()
diff --git a/debian/patches/series b/debian/patches/series
index af6d009..c0916ef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,2 @@
 0001-Add-CMakeLists.txt.patch
 0002-Add-Debian-specific-SOVERSION.patch
-0003-Fix-Boost-library-linking.patch
-0004-Add-install-target-for-python-wrapper-library.patch

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