upgrade package and change to official source

2 files changed, 7 insertions, 15 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53a6cffc0647..1547ccf92ee9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ros-melodic-gazebo-ros-control
 	pkgdesc = ROS - gazebo_ros_control.
-	pkgver = 2.8.4
+	pkgver = 2.8.5
 	pkgrel = 1
 	url = http://ros.org/wiki/gazebo_ros_control
 	arch = any
@@ -30,8 +30,8 @@ pkgbase = ros-melodic-gazebo-ros-control
 	depends = ros-melodic-gazebo-ros
 	depends = ros-melodic-control-toolbox
 	depends = ros-melodic-transmission-interface
-	source = ros-melodic-gazebo-ros-control-2.8.4-0.tar.gz::https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros_control/2.8.4-0.tar.gz
-	sha256sums = bf13aeb1f6a28b8510e759106a5f8d5b0c34d2e05dee6078e1bd12447fd79727
+	source = ros-melodic-gazebo-ros-control-2.8.5.tar.gz::https://github.com/ros-simulation/gazebo_ros_pkgs/archive/2.8.5.tar.gz
+	sha256sums = 0b0f6eeaeca611ebe12ec0ea4388121098fdafee5ecc8d76c6ae69b8b8f14aed
 
 pkgname = ros-melodic-gazebo-ros-control
 
diff --git a/PKGBUILD b/PKGBUILD
index fc70106c1ea0..983f4b650d19 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,8 +4,7 @@ pkgdesc="ROS - gazebo_ros_control."
 url='http://ros.org/wiki/gazebo_ros_control'
 
 pkgname='ros-melodic-gazebo-ros-control'
-pkgver='2.8.4'
-_pkgver_patch=0
+pkgver='2.8.5'
 arch=('any')
 pkgrel=1
 license=('BSD')
@@ -38,16 +37,9 @@ ros_depends=(ros-melodic-joint-limits-interface
   ros-melodic-transmission-interface)
 depends=(${ros_depends[@]})
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/gazebo_ros_control/${pkgver}-${_pkgver_patch}
-# _dir=${pkgname}
-# source=("${_dir}"::"git+https://github.com/ros-gbp/gazebo_ros_pkgs-release.git"#tag=${_tag})
-# sha256sums=('SKIP')
-
-# Tarball version (faster download)
-_dir="gazebo_ros_pkgs-release-release-melodic-gazebo_ros_control-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros_control/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('bf13aeb1f6a28b8510e759106a5f8d5b0c34d2e05dee6078e1bd12447fd79727')
+_dir="gazebo_ros_pkgs-${pkgver}/gazebo_ros_control"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-simulation/gazebo_ros_pkgs/archive/${pkgver}.tar.gz")
+sha256sums=('0b0f6eeaeca611ebe12ec0ea4388121098fdafee5ecc8d76c6ae69b8b8f14aed')
 
 build() {
   # Use ROS environment variables