Merge pull request #71 from ROBOTIS-GIT/develop

updated the CHANGELOG and version to release binary packages
ROBOTIS-GIT · Jan 22, 2019 · a6f8e14 · a6f8e14
2 parents 2275a11 + b7109be
commit a6f8e14
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 11 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -23,7 +23,6 @@ env:
     - ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
 matrix:
   allow_failures:
-    - env: ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=ubuntu OS_CODE_NAME=bionic
     - env: ROS_DISTRO=melodic ROS_REPO=ros-shadow-fixed UPSTREAM_WORKSPACE=debian OS_NAME=debian OS_CODE_NAME=stretch
 branches:
   only:

diff --git a/turtlebot3_fake/CHANGELOG.rst b/turtlebot3_fake/CHANGELOG.rst
@@ -2,6 +2,11 @@
 Changelog for package turtlebot3_fake
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.0 (2019-01-22)
+------------------
+* move out the init() from ROS_ASSERT `#68 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/68>`_
+* Contributors: Sean Yen, Darby Lim, Pyo
+
 1.1.0 (2018-07-20)
 ------------------
 * added TurtleBot3 Waffle Pi

diff --git a/turtlebot3_fake/package.xml b/turtlebot3_fake/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_fake</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>
     Package for TurtleBot3 fake node. With this package, simple tests can be done without a robot.
     You can do simple tests using this package on rviz without real robots.
@@ -10,6 +10,7 @@
   <author email="pyo@robotis.com">Pyo</author>
   <author email="thlim@robotis.com">Darby Lim</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="thlim@robotis.com">Darby Lim</maintainer>
   <url type="website">http://wiki.ros.org/turtlebot3_fake</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_simulations</url>

diff --git a/turtlebot3_gazebo/CHANGELOG.rst b/turtlebot3_gazebo/CHANGELOG.rst
@@ -2,6 +2,14 @@
 Changelog for package turtlebot3_gazebo_ros
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.0 (2019-01-22)
+------------------
+* moved <scene> into <world> `#65 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/65>`_
+* modified ML stage
+* delete unused param
+* update algorithm and modified variable more clearly
+* Contributors: Darby Lim, Gilbert, Louise Poubel, Pyo
+
 1.1.0 (2018-07-20)
 ------------------
 * modified uri path

diff --git a/turtlebot3_gazebo/package.xml b/turtlebot3_gazebo/package.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_gazebo</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>
     Gazebo simulation package for the TurtleBot3
   </description>
@@ -10,6 +10,7 @@
   <author email="thlim@robotis.com">Darby Lim</author>
   <author email="kkjong@robotis.com">Gilbert</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="thlim@robotis.com">Darby Lim</maintainer>
   <url type="website">http://wiki.ros.org/turtlebot3_gazebo</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_simulations</url>

diff --git a/turtlebot3_gazebo/worlds/empty.world b/turtlebot3_gazebo/worlds/empty.world
@@ -1,5 +1,12 @@
 <sdf version="1.4">
   <world name="default">
+
+    <scene>
+      <ambient>0.4 0.4 0.4 1</ambient>
+      <background>0.7 0.7 0.7 1</background>
+      <shadows>true</shadows>
+    </scene>
+
     <!-- A global light source -->
     <include>
       <uri>model://sun</uri>
@@ -32,10 +39,4 @@
     </physics>
   </world>
 
-  <scene>
-    <ambient>0.4 0.4 0.4 1</ambient>
-    <background>0.7 0.7 0.7 1</background>
-    <shadows>true</shadows>
-  </scene>
-
 </sdf>
diff --git a/turtlebot3_simulations/CHANGELOG.rst b/turtlebot3_simulations/CHANGELOG.rst
@@ -2,6 +2,15 @@
 Changelog for package turtlebot3_simulations
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+1.2.0 (2019-01-22)
+------------------
+* move out the init() from ROS_ASSERT `#68 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/68>`_
+* moved <scene> into <world> `#65 <https://github.com/ROBOTIS-GIT/turtlebot3_simulations/issues/65>`_
+* modified ML stage
+* delete unused param
+* update algorithm and modified variable more clearly
+* Contributors: Darby Lim, Gilbert, Louise Poubel, Pyo
+
 1.1.0 (2018-07-20)
 ------------------
 * added TurtleBot3 Waffle Pi

diff --git a/turtlebot3_simulations/package.xml b/turtlebot3_simulations/package.xml
@@ -1,15 +1,16 @@
 <?xml version="1.0"?>
 <package format="2">
   <name>turtlebot3_simulations</name>
-  <version>1.1.0</version>
+  <version>1.2.0</version>
   <description>
     ROS packages for the turtlebot3 simulation (meta package)
   </description>
   <license>Apache 2.0</license>
   <author email="pyo@robotis.com">Pyo</author>
   <author email="thlim@robotis.com">Darby Lim</author>
- <author email="kkjong@robotis.com">Gilbert</author>
+  <author email="kkjong@robotis.com">Gilbert</author>
   <maintainer email="pyo@robotis.com">Pyo</maintainer>
+  <maintainer email="thlim@robotis.com">Darby Lim</maintainer>
   <url type="website">http://wiki.ros.org/turtlebot3_simulations</url>
   <url type="emanual">http://turtlebot3.robotis.com</url>
   <url type="repository">https://github.com/ROBOTIS-GIT/turtlebot3_simulations</url>