Fix dependencies

2 files changed, 43 insertions, 69 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 911fa82c4dd7..4315e56bb1df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,49 +1,34 @@
 pkgbase = ros-melodic-costmap-2d
 	pkgdesc = ROS - This package provides an implementation of a 2D costmap.
 	pkgver = 1.16.2
-	pkgrel = 3
-	url = https://github.com/ros-planning/navigation
+	pkgrel = 4
+	url = https://wiki.ros.org/costmap_2d
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-message-filters
-	makedepends = ros-melodic-visualization-msgs
-	makedepends = ros-melodic-pcl-conversions
+	makedepends = ros-melodic-catkin
 	makedepends = ros-melodic-cmake-modules
-	makedepends = ros-melodic-nav-msgs
 	makedepends = ros-melodic-message-generation
-	makedepends = ros-melodic-tf
+	makedepends = ros-melodic-tf2-geometry-msgs
 	makedepends = ros-melodic-tf2-sensor-msgs
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-std-msgs
-	makedepends = ros-melodic-pluginlib
-	makedepends = ros-melodic-dynamic-reconfigure
-	makedepends = ros-melodic-map-msgs
-	makedepends = ros-melodic-sensor-msgs
-	makedepends = ros-melodic-voxel-grid
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-pcl-ros
-	makedepends = ros-melodic-laser-geometry
+	depends = ros-melodic-dynamic-reconfigure
+	depends = ros-melodic-geometry-msgs
+	depends = ros-melodic-laser-geometry
+	depends = ros-melodic-map-msgs
 	depends = ros-melodic-message-filters
-	depends = ros-melodic-visualization-msgs
-	depends = ros-melodic-pcl-conversions
 	depends = ros-melodic-nav-msgs
-	depends = ros-melodic-tf
-	depends = ros-melodic-tf2-sensor-msgs
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-message-runtime
-	depends = ros-melodic-std-msgs
 	depends = ros-melodic-pluginlib
-	depends = ros-melodic-dynamic-reconfigure
-	depends = ros-melodic-map-msgs
+	depends = ros-melodic-roscpp
+	depends = ros-melodic-rostest
 	depends = ros-melodic-sensor-msgs
+	depends = ros-melodic-std-msgs
+	depends = ros-melodic-tf2
+	depends = ros-melodic-tf2-ros
+	depends = ros-melodic-visualization-msgs
 	depends = ros-melodic-voxel-grid
-	depends = ros-melodic-pcl-ros
+	depends = ros-melodic-message-runtime
 	depends = ros-melodic-rosconsole
-	depends = ros-melodic-laser-geometry
 	source = ros-melodic-costmap-2d-1.16.2.tar.gz::https://github.com/ros-planning/navigation/archive/1.16.2.tar.gz
 	sha256sums = d83201296e773e2789635fddf39ac18e9465219b18707e53bd2361de4762d205
 
diff --git a/PKGBUILD b/PKGBUILD
index 3c5a5768d3fa..2655328a15a0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,62 +1,51 @@
 # Maintainer: Timon Engelke <aur@timonengelke.de>
 pkgdesc="ROS - This package provides an implementation of a 2D costmap."
-url='https://github.com/ros-planning/navigation'
+url='https://wiki.ros.org/costmap_2d'
 
 pkgname='ros-melodic-costmap-2d'
 pkgver='1.16.2'
 arch=('any')
-pkgrel=3
+pkgrel=4
 license=('BSD')
 
-ros_makedepends=(ros-melodic-message-filters
-  ros-melodic-visualization-msgs
-  ros-melodic-pcl-conversions
+ros_makedepends=(
+  ros-melodic-catkin
   ros-melodic-cmake-modules
-  ros-melodic-nav-msgs
   ros-melodic-message-generation
-  ros-melodic-tf
+  ros-melodic-tf2-geometry-msgs
   ros-melodic-tf2-sensor-msgs
-  ros-melodic-geometry-msgs
-  ros-melodic-roscpp
-  ros-melodic-std-msgs
-  ros-melodic-pluginlib
+)
+
+makedepends=(
+  'cmake'
+  'ros-build-tools'
+  ${ros_makedepends[@]}
+)
+
+ros_depends=(
   ros-melodic-dynamic-reconfigure
+  ros-melodic-geometry-msgs
+  ros-melodic-laser-geometry
   ros-melodic-map-msgs
-  ros-melodic-sensor-msgs
-  ros-melodic-voxel-grid
-  ros-melodic-catkin
-  ros-melodic-pcl-ros
-  ros-melodic-laser-geometry)
-makedepends=('cmake' 'ros-build-tools'
-  ${ros_makedepends[@]})
-
-ros_depends=(ros-melodic-message-filters
-  ros-melodic-visualization-msgs
-  ros-melodic-pcl-conversions
+  ros-melodic-message-filters
   ros-melodic-nav-msgs
-  ros-melodic-tf
-  ros-melodic-tf2-sensor-msgs
-  ros-melodic-geometry-msgs
-  ros-melodic-roscpp
-  ros-melodic-message-runtime
-  ros-melodic-std-msgs
   ros-melodic-pluginlib
-  ros-melodic-dynamic-reconfigure
-  ros-melodic-map-msgs
+  ros-melodic-roscpp
+  ros-melodic-rostest
   ros-melodic-sensor-msgs
+  ros-melodic-std-msgs
+  ros-melodic-tf2
+  ros-melodic-tf2-ros
+  ros-melodic-visualization-msgs
   ros-melodic-voxel-grid
-  ros-melodic-pcl-ros
+  ros-melodic-message-runtime
   ros-melodic-rosconsole
-  ros-melodic-laser-geometry)
-depends=(${ros_depends[@]})
+)
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/costmap_2d/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/navigation-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
+depends=(
+    ${ros_depends[@]}
+)
 
-# Tarball version (faster download)
 _dir="navigation-${pkgver}/costmap_2d"
 source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-planning/navigation/archive/${pkgver}.tar.gz")
 sha256sums=('d83201296e773e2789635fddf39ac18e9465219b18707e53bd2361de4762d205')