Rebase from 'release/kinetic/cob_gazebo_plugins'

ipa320 · Sep 26, 2020 · 6ab89c4 · 6ab89c4
1 parent 45d0ec0
commit 6ab89c4
Show file tree

Hide file tree

Showing 11 changed files with 9 additions and 96 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -2,6 +2,13 @@
 Changelog for package cob_gazebo_plugins
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
+0.7.5 (2020-09-26)
+------------------
+* Merge pull request `#47 <https://github.com/ipa320/cob_gazebo_plugins/issues/47>`_ from fmessmer/test_noetic
+  test noetic
+* Bump CMake version to avoid CMP0048 warning
+* Contributors: Felix Messmer, fmessmer
+
 0.7.4 (2020-03-18)
 ------------------
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8.3)
+cmake_minimum_required(VERSION 3.0.2)
 project(cob_gazebo_plugins)
 find_package(catkin REQUIRED)
 catkin_metapackage()
diff --git a/debian/changelog.em b/debian/changelog.em
diff --git a/debian/compat.em b/debian/compat.em
diff --git a/debian/control.em b/debian/control.em
diff --git a/debian/copyright.em b/debian/copyright.em
diff --git a/debian/gbp.conf.em b/debian/gbp.conf.em
diff --git a/debian/rules.em b/debian/rules.em
diff --git a/debian/source/format.em b/debian/source/format.em
diff --git a/debian/source/options.em b/debian/source/options.em
diff --git a/package.xml b/package.xml
@@ -1,6 +1,6 @@
 <package format="2">
   <name>cob_gazebo_plugins</name>
-  <version>0.7.4</version>
+  <version>0.7.5</version>
   <description>cob_gazebo_plugins meta-package</description>
 
   <license>Apache 2.0</license>