Merge pull request #4 from acxz/master

Change source to official ros releases and updated package.

2 files changed, 9 insertions, 17 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 22df34346b1b..8f1e2cfe338c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 pkgbase = ros-melodic-gazebo-ros
 	pkgdesc = ROS - Provides ROS plugins that offer message and service publishers for interfacing with Gazebo through ROS.
-	pkgver = 2.8.4
+	pkgver = 2.8.5
 	pkgrel = 1
-	url = https://gazebosim\.org/tutorials\?cat=connect_ros
+	url = http://gazebosim.org/tutorials?cat=connect_ros
 	arch = any
 	license = Apache 2.0
 	makedepends = cmake
@@ -32,8 +32,8 @@ pkgbase = ros-melodic-gazebo-ros
 	depends = ros-melodic-gazebo-dev
 	depends = tinyxml
 	depends = python
-	source = ros-melodic-gazebo-ros-2.8.4-0.tar.gz::https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros/2.8.4-0.tar.gz
-	sha256sums = fde5c96dfbdfcd8550ae4b731d199348b50955157f0bc114f754c5a55170ca8a
+	source = ros-melodic-gazebo-ros-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
 
diff --git a/PKGBUILD b/PKGBUILD
index 4a59e60b4888..b97f7d17af75 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,10 @@
 # Script generated with import_catkin_packages.py
 # For more information: https://github.com/bchretien/arch-ros-stacks
 pkgdesc="ROS - Provides ROS plugins that offer message and service publishers for interfacing with Gazebo through ROS."
-url='https://gazebosim.org/tutorials?cat=connect_ros'
+url='http://gazebosim.org/tutorials?cat=connect_ros'
 
 pkgname='ros-melodic-gazebo-ros'
-pkgver='2.8.4'
-_pkgver_patch=0
+pkgver='2.8.5'
 arch=('any')
 pkgrel=1
 license=('Apache 2.0')
@@ -40,16 +39,9 @@ depends=(${ros_depends[@]}
   tinyxml
   python)
 
-# Git version (e.g. for debugging)
-# _tag=release/melodic/gazebo_ros/${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-${pkgver}-${_pkgver_patch}"
-source=("${pkgname}-${pkgver}-${_pkgver_patch}.tar.gz"::"https://github.com/ros-gbp/gazebo_ros_pkgs-release/archive/release/melodic/gazebo_ros/${pkgver}-${_pkgver_patch}.tar.gz")
-sha256sums=('fde5c96dfbdfcd8550ae4b731d199348b50955157f0bc114f754c5a55170ca8a')
+_dir="gazebo_ros_pkgs-${pkgver}/gazebo_ros"
+source=("${pkgname}-${pkgver}.tar.gz"::"https://github.com/ros-simulation/gazebo_ros_pkgs/archive/${pkgver}.tar.gz")
+sha256sums=('0b0f6eeaeca611ebe12ec0ea4388121098fdafee5ecc8d76c6ae69b8b8f14aed')
 
 build() {
   # Use ROS environment variables