upddeps

2 files changed, 56 insertions, 32 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f1687d902fec..e770fdd53bd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,18 +1,29 @@
 pkgbase = ros-noetic-panda-moveit-config
-	pkgdesc = Franka Emika Panda MoveIt! Config Package
+	pkgdesc = ROS - An automatically generated package with all the configuration and launch files for using the panda with the MoveIt! Motion Planning Framework
 	pkgver = 0.7.4
-	pkgrel = 1
+	pkgrel = 2
 	url = http://wiki.ros.org/panda_moveit_config
 	arch = i686
 	arch = x86_64
 	arch = aarch64
 	arch = armv7h
 	arch = armv6h
-	license = Apache
+	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
 	makedepends = ros-noetic-catkin
-	source = panda_moveit_config-0.7.4.tar.gz::https://github.com/ros-planning/panda_moveit_config/archive/0.7.4.tar.gz
+	depends = ros-noetic-franka-description
+	depends = ros-noetic-moveit-ros-move-group
+	depends = ros-noetic-moveit-fake-controller-manager
+	depends = ros-noetic-moveit-kinematics
+	depends = ros-noetic-moveit-planners-ompl
+	depends = ros-noetic-moveit-ros-visualization
+	depends = ros-noetic-joint-state-publisher
+	depends = ros-noetic-joint-state-publisher-gui
+	depends = ros-noetic-robot-state-publisher
+	depends = ros-noetic-xacro
+	depends = ros-noetic-topic-tools
+	source = ros-noetic-panda-moveit-config-0.7.4.tar.gz::https://github.com/ros-planning/panda_moveit_config/archive/0.7.4.tar.gz
 	sha256sums = d989d7a854cf65f994add6090e9a5609ae19bbe3b46c223c9ca9aceec0d357d1
 
 pkgname = ros-noetic-panda-moveit-config
diff --git a/PKGBUILD b/PKGBUILD
index c65fd2f13e08..c3dbe34f61ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,63 @@
+pkgdesc="ROS - An automatically generated package with all the configuration and launch files for using the panda with the MoveIt! Motion Planning Framework"
+url="http://wiki.ros.org/panda_moveit_config"
+
 pkgname="ros-noetic-panda-moveit-config"
 pkgver="0.7.4"
-pkgrel=1
-pkgdesc="Franka Emika Panda MoveIt! Config Package"
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-url="http://wiki.ros.org/panda_moveit_config"
-license=('Apache')
+pkgrel=2
+license=('BSD')
 
 ros_makedepends=(
-    'ros-noetic-catkin'
+    ros-noetic-catkin
 )
 
 makedepends=(
-    'cmake'
-    'ros-build-tools'
+    cmake
+    ros-build-tools
     ${ros_makedepends[@]}
 )
 
-ros_depends=()
+ros_depends=(
+    ros-noetic-franka-description
+    ros-noetic-moveit-ros-move-group
+    ros-noetic-moveit-fake-controller-manager
+    ros-noetic-moveit-kinematics
+    ros-noetic-moveit-planners-ompl
+    ros-noetic-moveit-ros-visualization
+    ros-noetic-joint-state-publisher
+    ros-noetic-joint-state-publisher-gui
+    ros-noetic-robot-state-publisher
+    ros-noetic-xacro
+    ros-noetic-topic-tools
+)
 
 depends=(
     ${ros_depends[@]}
 )
 
-source=("panda_moveit_config-$pkgver.tar.gz::https://github.com/ros-planning/panda_moveit_config/archive/$pkgver.tar.gz")
-sha256sums=(d989d7a854cf65f994add6090e9a5609ae19bbe3b46c223c9ca9aceec0d357d1)
-
+_dir="panda_moveit_config-$pkgver"
+source=("${pkgname}-$pkgver.tar.gz"::"https://github.com/ros-planning/panda_moveit_config/archive/${pkgver}.tar.gz")
+sha256sums=('d989d7a854cf65f994add6090e9a5609ae19bbe3b46c223c9ca9aceec0d357d1')
 
 build() {
-	# Use ROS environment variables
-  	source /usr/share/ros-build-tools/clear-ros-env.sh
-  	[ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
-
-	# Create build directory
-  	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
-  	cd ${srcdir}/build
-
-	# Build project
-	cmake ${srcdir}/panda_moveit_config-$pkgver \
-	      -DCATKIN_BUILD_BINARY_PACKAGE=ON \
-	      -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
-	      -DPYTHON_EXECUTABLE=/usr/bin/python \
-	      -DSETUPTOOLS_DEB_LAYOUT=OFF
-	make
+    # Use ROS environment variables
+    source /usr/share/ros-build-tools/clear-ros-env.sh
+    [ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
+
+    # Create build directory
+    [ -d ${srcdir}/build ] || mkdir ${srcdir}/build
+    cd ${srcdir}/build
+
+    # Build project
+    cmake ${srcdir}/${_dir} \
+          -DCATKIN_BUILD_BINARY_PACKAGE=ON \
+          -DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+          -DPYTHON_EXECUTABLE=/usr/bin/python \
+          -DSETUPTOOLS_DEB_LAYOUT=OFF
+    make
 }
 
 package() {
-	cd "${srcdir}/build"
-	make DESTDIR="${pkgdir}/" install
+    cd "${srcdir}/build"
+    make DESTDIR="${pkgdir}/" install
 }