create ros-noetic-teleop-twist-joy package

2 files changed, 36 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c7757f489d23..c4ade2ba3702 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
-pkgbase = ros-melodic-teleop-twist-joy
+pkgbase = ros-noetic-teleop-twist-joy
 	pkgdesc = ROS - Generic joystick teleop for twist robots.
 	pkgver = 0.1.3
-	pkgrel = 3
+	pkgrel = 1
 	url = https://wiki.ros.org/teleop_twist_joy
 	arch = i686
 	arch = x86_64
@@ -11,21 +11,20 @@ pkgbase = ros-melodic-teleop-twist-joy
 	license = BSD
 	makedepends = cmake
 	makedepends = ros-build-tools
-	makedepends = ros-melodic-catkin
-	makedepends = ros-melodic-geometry-msgs
-	makedepends = ros-melodic-joy
-	makedepends = ros-melodic-roscpp
-	makedepends = ros-melodic-roslaunch
-	makedepends = ros-melodic-roslint
-	makedepends = ros-melodic-rostest
-	makedepends = ros-melodic-sensor-msgs
+	makedepends = ros-noetic-catkin
+	makedepends = ros-noetic-geometry-msgs
+	makedepends = ros-noetic-joy
+	makedepends = ros-noetic-roscpp
+	makedepends = ros-noetic-roslaunch
+	makedepends = ros-noetic-roslint
+	makedepends = ros-noetic-rostest
+	makedepends = ros-noetic-sensor-msgs
 	depends = eigen
-	depends = ros-melodic-geometry-msgs
-	depends = ros-melodic-joy
-	depends = ros-melodic-roscpp
-	depends = ros-melodic-sensor-msgs
-	source = ros-melodic-teleop-twist-joy-0.1.3.tar.gz::https://github.com/ros-teleop/teleop_twist_joy/archive/0.1.3.tar.gz
+	depends = ros-noetic-geometry-msgs
+	depends = ros-noetic-joy
+	depends = ros-noetic-roscpp
+	depends = ros-noetic-sensor-msgs
+	source = ros-noetic-teleop-twist-joy-0.1.3.tar.gz::https://github.com/ros-teleop/teleop_twist_joy/archive/0.1.3.tar.gz
 	sha256sums = 4b83d6e52e9334f63182af5cf6ebbfb1c1e38f009f39542d32483479bd9c80d2
 
-pkgname = ros-melodic-teleop-twist-joy
-
+pkgname = ros-noetic-teleop-twist-joy
diff --git a/PKGBUILD b/PKGBUILD
index 50811c7e50ca..ebe5fea58448 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,38 @@
 pkgdesc="ROS - Generic joystick teleop for twist robots."
 url='https://wiki.ros.org/teleop_twist_joy'
 
-pkgname='ros-melodic-teleop-twist-joy'
+pkgname='ros-noetic-teleop-twist-joy'
 pkgver='0.1.3'
 arch=('i686' 'x86_64' 'aarch64' 'armv7h' 'armv6h')
-pkgrel=3
+pkgrel=1
 license=('BSD')
 
 ros_makedepends=(
-    ros-melodic-catkin
-    ros-melodic-geometry-msgs
-    ros-melodic-joy
-    ros-melodic-roscpp
-    ros-melodic-roslaunch
-    ros-melodic-roslint
-    ros-melodic-rostest
-    ros-melodic-sensor-msgs
+    ros-noetic-catkin
+    ros-noetic-geometry-msgs
+    ros-noetic-joy
+    ros-noetic-roscpp
+    ros-noetic-roslaunch
+    ros-noetic-roslint
+    ros-noetic-rostest
+    ros-noetic-sensor-msgs
 )
 
 makedepends=(
-	'cmake'
-	'ros-build-tools'
+	cmake
+	ros-build-tools
 	${ros_makedepends[@]}
 )
 
 ros_depends=(
-    ros-melodic-geometry-msgs
-    ros-melodic-joy
-    ros-melodic-roscpp
-    ros-melodic-sensor-msgs
+    ros-noetic-geometry-msgs
+    ros-noetic-joy
+    ros-noetic-roscpp
+    ros-noetic-sensor-msgs
 )
 
 depends=(
-    'eigen'
+    eigen
 	${ros_depends[@]}
 )
 
@@ -43,21 +43,18 @@ sha256sums=('4b83d6e52e9334f63182af5cf6ebbfb1c1e38f009f39542d32483479bd9c80d2')
 build() {
 	# Use ROS environment variables.
 	source /usr/share/ros-build-tools/clear-ros-env.sh
-	[ -f /opt/ros/melodic/setup.bash ] && source /opt/ros/melodic/setup.bash
+	[ -f /opt/ros/noetic/setup.bash ] && source /opt/ros/noetic/setup.bash
 
 	# Create the build directory.
 	[ -d ${srcdir}/build ] || mkdir ${srcdir}/build
 	cd ${srcdir}/build
 
-	# Fix Python2/Python3 conflicts.
-	/usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
-
 	# Build the project.
 	cmake ${srcdir}/${_dir} \
 		-DCMAKE_BUILD_TYPE=Release \
 		-DCATKIN_BUILD_BINARY_PACKAGE=ON \
-		-DCMAKE_INSTALL_PREFIX=/opt/ros/melodic \
-		-DPYTHON_EXECUTABLE=/usr/bin/python3 \
+		-DCMAKE_INSTALL_PREFIX=/opt/ros/noetic \
+		-DPYTHON_EXECUTABLE=/usr/bin/python \
 		-DSETUPTOOLS_DEB_LAYOUT=OFF
 	make
 }