[ros-image-common] 01/01: Add new package image-transport-tools and adopt plugin

[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 c12c79eb6a7999db1a713d263521e57ae0b30283
Author: Jochen Sprickerhof <git at jochen.sprickerhof.de>
Date:   Mon Nov 30 17:58:40 2015 +0100

    Add new package image-transport-tools and adopt plugin
---
 debian/control                                       | 12 ++++++++++++
 debian/image-transport-tools.install                 |  3 +++
 debian/libimage-transport-dev.install                |  5 +++--
 debian/libimage-transport0d.install                  |  3 +--
 .../patches/0002-Add-Debian-specific-SOVERSION.patch | 20 ++++++--------------
 5 files changed, 25 insertions(+), 18 deletions(-)

diff --git a/debian/control b/debian/control
index 05f96ce..83a9958 100644
--- a/debian/control
+++ b/debian/control
@@ -68,6 +68,18 @@ Description: Robot OS image_transport package
  compressed formats. Examples (provided by separate plugin packages)
  include JPEG/PNG compression and Theora streaming video.
 
+Package: image-transport-tools
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: Robot OS image_transport package
+ This package is part of Robot OS (ROS). This library should always be
+ used to subscribe to and publish images. It (image_transport)
+ provides transparent support for transporting images in low-bandwidth
+ compressed formats. Examples (provided by separate plugin packages)
+ include JPEG/PNG compression and Theora streaming video.
+ .
+ This package provides the tools list_transports and republish.
+
 Package: libpolled-camera-dev
 Section: libdevel
 Architecture: any
diff --git a/debian/image-transport-tools.install b/debian/image-transport-tools.install
new file mode 100644
index 0000000..b068dd3
--- /dev/null
+++ b/debian/image-transport-tools.install
@@ -0,0 +1,3 @@
+usr/lib/*/image_transport
+usr/lib/*/libimage_transport_plugins.so usr/lib/image_transport
+usr/share/image_transport/default_plugins.xml
diff --git a/debian/libimage-transport-dev.install b/debian/libimage-transport-dev.install
index 9d58964..92e0e8b 100644
--- a/debian/libimage-transport-dev.install
+++ b/debian/libimage-transport-dev.install
@@ -1,4 +1,5 @@
 usr/include/image_transport
-usr/lib/*/libimage_transport*.so
+usr/lib/*/libimage_transport.so
 usr/lib/*/pkgconfig/image_transport.pc
-usr/share/image_transport
+usr/share/image_transport/package.xml
+usr/share/image_transport/cmake
diff --git a/debian/libimage-transport0d.install b/debian/libimage-transport0d.install
index 36c8d3e..de3d1bc 100644
--- a/debian/libimage-transport0d.install
+++ b/debian/libimage-transport0d.install
@@ -1,2 +1 @@
-usr/lib/*/image_transport
-usr/lib/*/libimage_transport*.so.*
+usr/lib/*/libimage_transport.so.*
diff --git a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
index d7b120d..75e38da 100644
--- a/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
+++ b/debian/patches/0002-Add-Debian-specific-SOVERSION.patch
@@ -5,15 +5,15 @@ Subject: Add Debian specific SOVERSION
 ---
  camera_calibration_parsers/CMakeLists.txt | 1 +
  camera_info_manager/CMakeLists.txt        | 1 +
- image_transport/CMakeLists.txt            | 2 ++
+ image_transport/CMakeLists.txt            | 1 +
  polled_camera/CMakeLists.txt              | 1 +
- 4 files changed, 5 insertions(+)
+ 4 files changed, 4 insertions(+)
 
 diff --git a/camera_calibration_parsers/CMakeLists.txt b/camera_calibration_parsers/CMakeLists.txt
-index 045f8a0..c002f5d 100644
+index 0893dbc..ff153ab 100644
 --- a/camera_calibration_parsers/CMakeLists.txt
 +++ b/camera_calibration_parsers/CMakeLists.txt
-@@ -40,6 +40,7 @@ add_library(${PROJECT_NAME}
+@@ -35,6 +35,7 @@ add_library(${PROJECT_NAME}
  )
  
  target_link_libraries(${PROJECT_NAME} ${catkin_LIBRARIES} ${YAML_CPP_LIBRARIES} ${Boost_LIBRARIES})
@@ -22,7 +22,7 @@ index 045f8a0..c002f5d 100644
  add_dependencies(${PROJECT_NAME} sensor_msgs_gencpp)
  
 diff --git a/camera_info_manager/CMakeLists.txt b/camera_info_manager/CMakeLists.txt
-index 6212116..2da4b5e 100644
+index bcb250e..bc05273 100644
 --- a/camera_info_manager/CMakeLists.txt
 +++ b/camera_info_manager/CMakeLists.txt
 @@ -18,6 +18,7 @@ include_directories(include)
@@ -34,7 +34,7 @@ index 6212116..2da4b5e 100644
  install(TARGETS ${PROJECT_NAME}
          DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 diff --git a/image_transport/CMakeLists.txt b/image_transport/CMakeLists.txt
-index 72a3547..eb95c79 100644
+index 72a3547..6994a9f 100644
 --- a/image_transport/CMakeLists.txt
 +++ b/image_transport/CMakeLists.txt
 @@ -32,6 +32,7 @@ add_library(${PROJECT_NAME}
@@ -45,14 +45,6 @@ index 72a3547..eb95c79 100644
  target_link_libraries(${PROJECT_NAME}
    ${Boost_LIBRARIES}
    ${catkin_LIBRARIES}
-@@ -40,6 +41,7 @@ target_link_libraries(${PROJECT_NAME}
- # Build libimage_transport_plugins                                      
- add_library(${PROJECT_NAME}_plugins src/manifest.cpp src/raw_publisher.cpp)
- target_link_libraries(${PROJECT_NAME}_plugins ${PROJECT_NAME})
-+set_target_properties(${PROJECT_NAME}_plugins PROPERTIES VERSION ${image_transport_VERSION} SOVERSION "0d")
- 
- install(TARGETS ${PROJECT_NAME} ${PROJECT_NAME}_plugins
-         DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
 diff --git a/polled_camera/CMakeLists.txt b/polled_camera/CMakeLists.txt
 index 7353223..0e17c40 100644
 --- a/polled_camera/CMakeLists.txt

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