[wip/{ → py-}prf-gazebo-ros-pkgs] fix PLIST

Affected packages by rename:
- pal-gazebo-plugins
- pal-gazebo-worlds
- pal-hardware-gazebo
- prf-roboticsgroup-gazebo-plugins
- py-talos-dev
- talos-data
- tiago-dev

Makefile

@@ -61,7 +61,6 @@ SUBDIR+=	play-motion
 SUBDIR+=	pmb2-robot
 SUBDIR+=	pmb2-navigation
 SUBDIR+=	pmb2-simulation
-SUBDIR+=	prf-gazebo-ros-pkgs
 SUBDIR+=	prf-roboticsgroup-gazebo-plugins
 SUBDIR+=	prf-teleop-tools
 SUBDIR+=	py-bmtools
@@ -95,6 +94,7 @@ SUBDIR+=	py-ospi
 SUBDIR+=	py-pal
 SUBDIR+=	py-pal-statistics
 SUBDIR+=	py-parametric-curves
+SUBDIR+=	py-prf-gazebo-ros-pkgs
 SUBDIR+=	py-prf-ros-control
 SUBDIR+=	py-prf-ros-controllers
 SUBDIR+=	py-qpoases

pal-gazebo-plugins/Makefile

@@ -30,7 +30,7 @@ ifeq (16.04,${OS_VERSION})
 endif
 
 include ../../wip/pal-msgs/depend.mk
-include ../../wip/prf-gazebo-ros-pkgs/depend.mk
+include ../../wip/py-prf-gazebo-ros-pkgs/depend.mk
 
 include ../../devel/boost-headers/depend.mk
 include ../../devel/boost-libs/depend.mk

pal-gazebo-worlds/Makefile

@@ -24,7 +24,7 @@ LICENSE=		gnu-lgpl-v3
 
 CMAKE_PREFIX_PATH+=	${PREFIX}
 
-include ../../wip/prf-gazebo-ros-pkgs/depend.mk
+include ../../wip/py-prf-gazebo-ros-pkgs/depend.mk
 
 include ../../devel/ros-catkin/depend.mk
 include ../../devel/ros-roscpp-core/depend.mk

pal-hardware-gazebo/Makefile

@@ -37,7 +37,7 @@ endif
 
 include ../../wip/dynamic-introspection/depend.mk
 include ../../wip/pal-hardware-interfaces/depend.mk
-include ../../wip/prf-gazebo-ros-pkgs/depend.mk
+include ../../wip/py-prf-gazebo-ros-pkgs/depend.mk
 include ../../wip/py-pal-statistics/depend.mk
 include ../../wip/py-prf-ros-control/depend.mk
 

prf-roboticsgroup-gazebo-plugins/Makefile

@@ -29,7 +29,7 @@ CMAKE_ARGS+=\
 
 CMAKE_PREFIX_PATH+= ${PREFIX}
 
-include ../../wip/prf-gazebo-ros-pkgs/depend.mk
+include ../../wip/py-prf-gazebo-ros-pkgs/depend.mk
 include ../../wip/pal-hardware-interfaces/depend.mk
 
 include ../../devel/boost-headers/depend.mk

prf-gazebo-ros-pkgs/Makefile → py-prf-gazebo-ros-pkgs/Makefile

-# robotpkg Makefile for:	wip/prf-gazebo-ros-pkgs
+# robotpkg Makefile for:	wip/py-prf-gazebo-ros-pkgs
 # Created:			Olivier Stasse on Mer, 28 April 2018
 #
 
@@ -9,12 +9,16 @@ VERSION=		3.0.1
 PRFNAME=		prf-${NAME}
 ROSNAME=		$(subst -,_,${NAME})
 
-PKGNAME=		${PRFNAME}-${VERSION}
+PKGNAME=		${PKGTAG.python-}${PRFNAME}-${VERSION}
 WRKSRC=			${WRKDIR}/${ROSNAME}-${VERSION}
 DISTNAME=		${VERSION}
 DIST_SUBDIR=		${PRFNAME}
 
+# old package name, other Python versions, and forked package.
+CONFLICTS+=		${PRFNAME}-[0-9]*
+CONFLICTS+=		py[0-9][0-9]-${PRFNAME}-[0-9]*
 CONFLICTS+=		${NAME}-[0-9]*
+
 CATEGORIES=		wip
 
 MASTER_REPOSITORY=	${MASTER_REPOSITORY_GITHUB}${ORG}/${ROSNAME}.git
@@ -35,8 +39,9 @@ CMAKE_PREFIX_PATH+=	${PREFIX}
 include ../../mk/robotpkg.prefs.mk
 ifeq (16.04,${OS_VERSION})
   VERSION=		2.6.9
-  DISTINFO_FILE=	${ROBOTPKG_DIR}/${CATEGORIES}/${PRFNAME}/distinfo.${OS_VERSION}
-  PATCHDIR=		${ROBOTPKG_DIR}/${CATEGORIES}/${PRFNAME}/patches.${OS_VERSION}
+  DISTINFO_FILE=	${ROBOTPKG_DIR}/${CATEGORIES}/py-${PRFNAME}/distinfo.${OS_VERSION}
+  PATCHDIR=		${ROBOTPKG_DIR}/${CATEGORIES}/py-${PRFNAME}/patches.${OS_VERSION}
+  PLIST_SRC=		${ROBOTPKG_DIR}/${CATEGORIES}/py-${PRFNAME}/PLIST.${OS_VERSION}
 endif
 
 include ../../wip/py-prf-ros-control/depend.mk
@@ -64,6 +69,7 @@ include ../../motion/ros-control-toolbox/depend.mk
 include ../../sysutils/ros-diagnostics/depend.mk
 include ../../mk/sysdep/gazebo.mk
 include ../../mk/sysdep/libogre.mk
+include ../../mk/sysdep/python.mk
 include ../../mk/language/c++.mk
 include ../../mk/language/c.mk
 include ../../mk/robotpkg.mk

prf-gazebo-ros-pkgs/depend.mk → py-prf-gazebo-ros-pkgs/depend.mk

-# robotpkg depend.mk for:	wip/prf-gazebo-ros-pkgs
+# robotpkg depend.mk for:	wip/py-prf-gazebo-ros-pkgs
 # Created:			Olivier Stasse on Mer, 3 May 2017
 #
 
 DEPEND_DEPTH:=				${DEPEND_DEPTH}+
-GAZEBO_ROS_PKGS_DEPEND_MK:=	${GAZEBO_ROS_PKGS_DEPEND_MK}+
+PY_PRF_GAZEBO_ROS_PKGS_DEPEND_MK:=	${PY_PRF_GAZEBO_ROS_PKGS_DEPEND_MK}+
 
 ifeq (+,$(DEPEND_DEPTH))
-DEPEND_PKG+=				prf-gazebo-ros-pkgs
+DEPEND_PKG+=				py-prf-gazebo-ros-pkgs
 endif
 
-ifeq (+,$(GAZEBO_ROS_PKGS_DEPEND_MK)) # ---------------------------
+ifeq (+,$(PY_PRF_GAZEBO_ROS_PKGS_DEPEND_MK)) # ---------------------------
 
 include ../../mk/robotpkg.prefs.mk  # for OS_VERSION
+include ../../mk/sysdep/python.mk   # for PKGTAG.python
 
-PREFER.prf-gazebo-ros-pkgs?=	robotpkg
+PREFER.py-prf-gazebo-ros-pkgs?=	robotpkg
 
-DEPEND_USE+=				prf-gazebo-ros-pkgs
+DEPEND_USE+=				py-prf-gazebo-ros-pkgs
 
 ifneq (,$(filter 16.04,${OS_VERSION}))
-  DEPEND_ABI.prf-gazebo-ros-pkgs?=	prf-gazebo-ros-pkgs>=2.6.5<3.0.0
+  DEPEND_ABI.py-prf-gazebo-ros-pkgs?=	${PKGTAG.python-}prf-gazebo-ros-pkgs>=2.6.5<3.0.0
 else
-  DEPEND_ABI.prf-gazebo-ros-pkgs?=	prf-gazebo-ros-pkgs>=3.0.1
+  DEPEND_ABI.py-prf-gazebo-ros-pkgs?=	${PKGTAG.python-}prf-gazebo-ros-pkgs>=3.0.1
 endif
 
-DEPEND_DIR.prf-gazebo-ros-pkgs?=	../../wip/prf-gazebo-ros-pkgs
+DEPEND_DIR.py-prf-gazebo-ros-pkgs?=	../../wip/py-prf-gazebo-ros-pkgs
 
-SYSTEM_SEARCH.prf-gazebo-ros-pkgs=					\
+SYSTEM_SEARCH.py-prf-gazebo-ros-pkgs=					\
   'include/gazebo_ros_control/gazebo_ros_control_plugin.h'		\
   'include/gazebo_ros_control/default_robot_hw_sim.h'			\
   'include/gazebo_ros_control/robot_hw_sim.h'				\
   'share/gazebo_ros_control/cmake/gazebo_ros_controlConfig.cmake'	\
   'share/gazebo_ros_control/package.xml:/<version>/s/[^0-9.]//gp'	\
-  'lib/pkgconfig/gazebo_ros_control.pc:/Version/s/[^0-9.]//gp'
+  'lib/pkgconfig/gazebo_ros_control.pc:/Version/s/[^0-9.]//gp'		\
+  '${PYTHON_SYSLIBSEARCH}/gazebo_msgs/__init__.py'
 
-endif # GAZEBO_ROS_PKGS_DEPEND_MK ---------------------------------
+endif # PY_PRF_GAZEBO_ROS_PKGS_DEPEND_MK ---------------------------------
 
 DEPEND_DEPTH:=				${DEPEND_DEPTH:+=}

py-talos-dev/Makefile

@@ -11,7 +11,7 @@ COMMENT=	Talos dev Software
 
 META_PACKAGE=	yes
 
-include ../../wip/prf-gazebo-ros-pkgs/depend.mk
+include ../../wip/py-prf-gazebo-ros-pkgs/depend.mk
 
 include ../../wip/py-prf-ros-control/depend.mk
 include ../../wip/py-sot-talos/depend.mk

talos-data/Makefile

@@ -21,7 +21,7 @@ CMAKE_PREFIX_PATH+= ${PREFIX}
 
 DYNAMIC_PLIST_DIRS+=	share/doc/${ROSNAME}
 
-include ../../wip/prf-gazebo-ros-pkgs/depend.mk
+include ../../wip/py-prf-gazebo-ros-pkgs/depend.mk
 
 include ../../devel/jrl-cmakemodules/Makefile.common
 include ../../devel/ros-catkin/depend.mk

tiago-dev/Makefile

@@ -13,7 +13,7 @@ META_PACKAGE=	yes
 
 include ../../wip/py-sot-tiago/depend.mk
 include ../../wip/pal-wsg-gripper/depend.mk
-include ../../wip/prf-gazebo-ros-pkgs/depend.mk
+include ../../wip/py-prf-gazebo-ros-pkgs/depend.mk
 include ../../wip/tiago-metapkg-ros-control-sot/depend.mk
 include ../../wip/tiago-simulation/depend.mk