Merge pull request ros-industrial#79 from ros-industrial/hydro

Release changes pulled into dev branch
OrebroUniversity · Jun 27, 2014 · b0d1cb5 · b0d1cb5
2 parents 94358bd + 6a052e9
commit b0d1cb5
Show file tree

Hide file tree

Showing 16 changed files with 60 additions and 8 deletions.
diff --git a/industrial_core/CHANGELOG.rst b/industrial_core/CHANGELOG.rst
@@ -2,12 +2,18 @@
 Changelog for package industrial_core
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.3.4 (2014-01-21)
+------------------
+* Fix `#67 <https://github.com/ros-industrial/industrial_core/issues/67>`_.
+
 0.3.3 (2014-01-13)
 ------------------
 * Fixed build issue due simple message library linking
+
 0.3.2 (2014-01-10)
 ------------------
 * Removed header from industrial_utils/utils.h (not required)
+
 0.3.1 (2014-01-09)
 ------------------
 * Added industrial trajectory filters to core meta-package

diff --git a/industrial_core/package.xml b/industrial_core/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>industrial_core</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>ROS-Industrial core stack contains packages and libraries for supporing industrial systems</description>
 
   <maintainer email="[email protected]">Shaun Edwards</maintainer>

diff --git a/industrial_deprecated/CHANGELOG.rst b/industrial_deprecated/CHANGELOG.rst
@@ -2,9 +2,14 @@
 Changelog for package industrial_deprecated
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.3.4 (2014-01-21)
+------------------
+* No change
+
 0.3.3 (2014-01-13)
 ------------------
 * No change
+
 0.3.2 (2014-01-10)
 ------------------
 * No change

diff --git a/industrial_deprecated/package.xml b/industrial_deprecated/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>industrial_deprecated</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>
   The Industrial deprecated package contains nodes, launch files, etc... that are slated for 
   deprecation.  This package is the last place something will end up before being deleted.  

diff --git a/industrial_msgs/CHANGELOG.rst b/industrial_msgs/CHANGELOG.rst
@@ -2,9 +2,14 @@
 Changelog for package industrial_msgs
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.3.4 (2014-01-21)
+------------------
+* No change
+
 0.3.3 (2014-01-13)
 ------------------
 * No change
+
 0.3.2 (2014-01-10)
 ------------------
 * No change

diff --git a/industrial_msgs/package.xml b/industrial_msgs/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>industrial_msgs</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>
 	The industrial message package containes industrial specific messages 
 	definitions. This package is part of the ROS-Industrial program.

diff --git a/industrial_robot_client/CHANGELOG.rst b/industrial_robot_client/CHANGELOG.rst
@@ -2,6 +2,17 @@
 Changelog for package industrial_robot_client
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.3.4 (2014-01-21)
+------------------
+* robot_client: workaround for `#46 <https://github.com/shaun-edwards/industrial_core/issues/46>`_. Fix `#67 <https://github.com/shaun-edwards/industrial_core/issues/67>`_.
+  This is an updated version of the workaround committed in 9df46977. Instead
+  of requiring dependent packages to invoke the function defined in the
+  CFG_EXTRAS cmake snippet, the snippet now sets up the linker path directly.
+  Dependent packages now only need to remember to explicitly list their
+  dependency on `industrial_robot_client` and `simple_message` in their
+  `add_library(..)` statements.
+* Contributors: gavanderhoorn
+
 0.3.3 (2014-01-13)
 ------------------
 * Fixed build issue due simple message library linking

diff --git a/industrial_robot_client/package.xml b/industrial_robot_client/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>industrial_robot_client</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>industrial robot client contains generic clients for connecting 
      to industrial robot controllers with servers that adhere to the
      simple message protocol.

diff --git a/industrial_robot_simulator/CHANGELOG.rst b/industrial_robot_simulator/CHANGELOG.rst
@@ -2,9 +2,14 @@
 Changelog for package industrial_robot_simulator
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.3.4 (2014-01-21)
+------------------
+* No change
+
 0.3.3 (2014-01-13)
 ------------------
 * No change
+
 0.3.2 (2014-01-10)
 ------------------
 * Removed header from industrial_utils/utils.h (not required)

diff --git a/industrial_robot_simulator/package.xml b/industrial_robot_simulator/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>industrial_robot_simulator</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>The industrial robot simulator is a stand in for industrial robot driver node(s).  It adheres to the driver specification for industrial robot controllers.</description>
 
   <maintainer email="[email protected]">Shaun Edwards</maintainer>

diff --git a/industrial_trajectory_filters/CHANGELOG.rst b/industrial_trajectory_filters/CHANGELOG.rst
@@ -2,9 +2,14 @@
 Changelog for package industrial_trajectory_filters
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.3.4 (2014-01-21)
+------------------
+* No change
+
 0.3.3 (2014-01-13)
 ------------------
 * No change
+
 0.3.2 (2014-01-10)
 ------------------
 * Removed header from industrial_utils/utils.h (not required)

diff --git a/industrial_trajectory_filters/package.xml b/industrial_trajectory_filters/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>industrial_trajectory_filters</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>
    <p>
      ROS Industrial libraries/plugins for filtering trajectories.

diff --git a/industrial_utils/CHANGELOG.rst b/industrial_utils/CHANGELOG.rst
@@ -2,6 +2,10 @@
 Changelog for package industrial_utils
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.3.4 (2014-01-21)
+------------------
+* No change
+
 0.3.3 (2014-01-13)
 ------------------
 * No change

diff --git a/industrial_utils/package.xml b/industrial_utils/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>industrial_utils</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>Industrial utils is a library package that captures common funcitonality for the ROS-Industrial distribution.</description>
 
   <maintainer email="[email protected]">Shaun Edwards</maintainer>

diff --git a/simple_message/CHANGELOG.rst b/simple_message/CHANGELOG.rst
@@ -2,6 +2,17 @@
 Changelog for package simple_message
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.3.4 (2014-01-21)
+------------------
+* robot_client: workaround for `#46 <https://github.com/shaun-edwards/industrial_core/issues/46>`_. Fix `#67 <https://github.com/shaun-edwards/industrial_core/issues/67>`_.
+  This is an updated version of the workaround committed in 9df46977. Instead
+  of requiring dependent packages to invoke the function defined in the
+  CFG_EXTRAS cmake snippet, the snippet now sets up the linker path directly.
+  Dependent packages now only need to remember to explicitly list their
+  dependency on `industrial_robot_client` and `simple_message` in their
+  `add_library(..)` statements.
+* Contributors: gavanderhoorn
+
 0.3.3 (2014-01-13)
 ------------------
 * Fixed build issue due simple message library linking

diff --git a/simple_message/package.xml b/simple_message/package.xml
@@ -1,6 +1,6 @@
 <package>
   <name>simple_message</name>
-  <version>0.3.3</version>
+  <version>0.3.4</version>
   <description>
 	simple_message defines a simple messaging connection and protocol for communicating 
 	with an industrial robot controller.  Additional handler and manager classes are