Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Pull from upstream melodic branch #7

Open
wants to merge 4 commits into
base: kinetic
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions cv_bridge/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
Changelog for package cv_bridge
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.13.0 (2018-04-30)
-------------------
* Use rosdep OpenCV and not ROS one.
We defintely don't need the whole OpenCV.
We need to clean the rosdep keys.
* Contributors: Vincent Rabaud

1.12.8 (2018-04-17)
-------------------
* Merge pull request `#191 <https://github.com/ros-perception/vision_opencv/issues/191>`_ from patrickelectric/kinetic
Expand Down
5 changes: 3 additions & 2 deletions cv_bridge/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<package format="2">
<name>cv_bridge</name>
<version>1.12.8</version>
<version>1.13.0</version>
<description>
This contains CvBridge, which converts between ROS
Image messages and OpenCV images.
Expand All @@ -17,7 +17,7 @@
<rosdoc config="rosdoc.yaml" />
</export>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<buildtool_depend>catkin</buildtool_depend>

<build_depend>boost</build_depend>
<build_depend>opencv3_catkin</build_depend>
Expand All @@ -29,6 +29,7 @@
<exec_depend>opencv3_catkin</exec_depend>
<exec_depend>python</exec_depend>
<exec_depend>rosconsole</exec_depend>
<build_export_depend>opencv3_catkin</build_export_depend>
<build_export_depend>sensor_msgs</build_export_depend>

<test_depend>rostest</test_depend>
Expand Down
7 changes: 7 additions & 0 deletions image_geometry/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,13 @@
Changelog for package image_geometry
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.13.0 (2018-04-30)
-------------------
* Use rosdep OpenCV and not ROS one.
We defintely don't need the whole OpenCV.
We need to clean the rosdep keys.
* Contributors: Vincent Rabaud

1.12.8 (2018-04-17)
-------------------
* Merge pull request `#189 <https://github.com/ros-perception/vision_opencv/issues/189>`_ from ros2/python3_support_in_test
Expand Down
5 changes: 3 additions & 2 deletions image_geometry/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<package format="2">
<name>image_geometry</name>
<version>1.12.8</version>
<version>1.13.0</version>
<description>
`image_geometry` contains C++ and Python libraries for interpreting images
geometrically. It interfaces the calibration parameters in sensor_msgs/CameraInfo
Expand All @@ -16,12 +16,13 @@
<rosdoc config="rosdoc.yaml" />
</export>

<buildtool_depend version_gte="0.5.68">catkin</buildtool_depend>
<buildtool_depend>catkin</buildtool_depend>

<build_depend>opencv3_catkin</build_depend>
<build_depend>sensor_msgs</build_depend>

<exec_depend>opencv3_catkin</exec_depend>
<build_export_depend>opencv3_catkin</build_export_depend>
<build_export_depend>sensor_msgs</build_export_depend>

<doc_depend>dvipng</doc_depend>
Expand Down
3 changes: 3 additions & 0 deletions opencv_tests/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Changelog for package opencv_tests
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.13.0 (2018-04-30)
-------------------

1.12.8 (2018-04-17)
-------------------

Expand Down
2 changes: 1 addition & 1 deletion opencv_tests/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<package>
<name>opencv_tests</name>
<version>1.12.8</version>
<version>1.13.0</version>
<description>
Tests the enumerants of the ROS Image message, and functionally tests the Python and C++ implementations of CvBridge.
</description>
Expand Down
3 changes: 3 additions & 0 deletions vision_opencv/CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@
Changelog for package vision_opencv
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^

1.13.0 (2018-04-30)
-------------------

1.12.8 (2018-04-17)
-------------------

Expand Down
2 changes: 1 addition & 1 deletion vision_opencv/package.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<package>
<name>vision_opencv</name>
<version>1.12.8</version>
<version>1.13.0</version>
<description>Packages for interfacing ROS with OpenCV, a library of programming functions for real time computer vision.</description>
<author>Patrick Mihelich</author>
<author>James Bowman</author>
Expand Down