[wip/talos-data] Update to v1.2.1

Changes since v1.2.0:
- CMake: export project and use exports from dependencies
- CMake: keep minimal required instructions
- CMake: set TALOS_DATA_PREFIX (which is not nice)

Packaging changes:
- removed patch-aa, applied upstream

talos-data/Makefile

@@ -4,8 +4,7 @@
 
 ORG=			pyrene-dev
 NAME=			talos-data
-VERSION=		1.2.0
-PKGREVISION=		1
+VERSION=		1.2.1
 
 ROSNAME=		$(subst -,_,${NAME})
 PKGNAME=		${NAME}-${VERSION}
@@ -33,12 +32,10 @@ include ../../middleware/ros-comm/depend.mk
 include ../../pkgtools/pkg-config/depend.mk
 
 include ../../wip/sysdep/ubuntu-distro.mk
-ifeq (bionic,${UBUNTUDISTRO})
-  include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
-else ifeq (xenial,${UBUNTUDISTRO})
+ifeq (xenial,${UBUNTUDISTRO})
   include ../../wip/prf-gazebo-ros-pkgs/depend.mk
 else
-  include ../../simulation/gazebo-ros-pkgs/depend.mk
+  include ../../wip/prf-gazebo-ros-pkgs-melodic/depend.mk
 endif
 
 include ../../mk/sysdep/gazebo.mk

talos-data/PLIST

@@ -7,17 +7,16 @@ lib/cmake/talos_data/talos_dataConfigVersion.cmake
 lib/cmake/talos_data/talos_dataTargets-release.cmake
 lib/cmake/talos_data/talos_dataTargets.cmake
 lib/libtalos_data.so
+lib/libtalos_data.so.${PKGVERSION}
 lib/pkgconfig/talos_data.pc
-share/talos_data/cmake/talos_dataConfig-version.cmake
-share/talos_data/cmake/talos_dataConfig.cmake
 share/talos_data/config/collision_parameters.yaml
 share/talos_data/config/default_configuration_half_sitting.yaml
 share/talos_data/config/default_configuration_hanging.yaml
 share/talos_data/config/default_configuration_locomotion.yaml
 share/talos_data/config/default_configuration_zeros.yaml
 share/talos_data/config/joint_limits.yaml
-share/talos_data/config/pids_stiff.yaml
 share/talos_data/config/pids_spring.yaml
+share/talos_data/config/pids_stiff.yaml
 share/talos_data/config/rviz.rviz
 share/talos_data/config/talos_plotjuggler.xml
 share/talos_data/gazebo/gazebo.urdf.xacro
@@ -110,6 +109,7 @@ share/talos_data/robots/talos_small.urdf.xacro
 share/talos_data/robots/upload.launch
 share/talos_data/robots/upload_talos.launch
 share/talos_data/scripts/start_talos_gazebo.py
+share/talos_data/scripts/start_talos_gazebo_16_04.py
 share/talos_data/srdf/pyrene.srdf
 share/talos_data/srdf/talos.srdf
 share/talos_data/srdf/talos_wpg.srdf

talos-data/distinfo

-SHA1 (talos_data-1.2.0.tar.gz) = 6b1ace90d6d4b566514a07835d1fff86240a6ff5
-RMD160 (talos_data-1.2.0.tar.gz) = f48e12e9426afb32fac61291e4719ee443922e20
-Size (talos_data-1.2.0.tar.gz) = 8860846 bytes
-SHA1 (patch-aa) = 3725dd74db1f66c7a4a57d87e890c400254408a8
+SHA1 (talos_data-1.2.1.tar.gz) = b4d4264b259ba85309ae284a8fb1b24ea81e0e5b
+RMD160 (talos_data-1.2.1.tar.gz) = 7760839f3655fd74bc6191972f1f8c7d504bf55e
+Size (talos_data-1.2.1.tar.gz) = 8866495 bytes

talos-data/patches/patch-aa

-Enable C language. Fix configure on Arch at:
-
--- FreeImage test failed to compile - This may indicate a build system bug
-CMake Error at /usr/lib64/cmake/ignition-cmake0/cmake0/FindFreeImage.cmake:46 (try_run):
-Unknown extension ".c" for file
-
-/home/nim/local/robotpkg/robotpkg/wip/talos-data/work.Nausicaa/talos_data-1.1.0/CMakeTmp/test_freeimage.c
-
-try_compile() works only for enabled languages.
-
---- CMakeLists.txt.orig	2019-12-18 10:44:33.000000000 +0100
-+++ CMakeLists.txt	2020-01-25 21:44:05.988941613 +0100
-@@ -13,7 +13,7 @@
- INCLUDE(cmake/base.cmake)
- 
- # Specify the project.
--COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX)
-+COMPUTE_PROJECT_ARGS(PROJECT_ARGS LANGUAGES CXX C)
- PROJECT(${PROJECT_NAME} ${PROJECT_ARGS})
- 
- find_package(catkin REQUIRED COMPONENTS