summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2015-05-21 13:11:27 +0900
committerBenjamin Chrétien2015-05-21 13:11:27 +0900
commit59db15fde0f07ccd1bb4f7176ace81f9b8a2e1c1 (patch)
tree4904f9f9778adaca9253a57e913649a6f1cef1bc
parentf0c4c82151dd0edb9db9ba09e0ad4024709caaef (diff)
downloadaur-59db15fde0f07ccd1bb4f7176ace81f9b8a2e1c1.tar.gz
indigo: desktop_full update.
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD8
2 files changed, 8 insertions, 9 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 2d03b2f34e49..66725d861fd3 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = ros-indigo-ros-base
pkgdesc = ROS - A metapackage which extends ros_core and includes other basic non-robot tools like actionlib, dynamic reconfigure, nodelets, and pluginlib.
- pkgver = 1.1.3
+ pkgver = 1.1.4
pkgrel = 1
url = http://www.ros.org/
arch = any
@@ -9,15 +9,14 @@ pkgbase = ros-indigo-ros-base
makedepends = git
makedepends = ros-build-tools
makedepends = ros-indigo-catkin
- depends = ros-indigo-dynamic-reconfigure
+ depends = ros-indigo-ros-core
depends = ros-indigo-nodelet-core
depends = ros-indigo-bond-core
- depends = ros-indigo-common-tutorials
depends = ros-indigo-actionlib
depends = ros-indigo-class-loader
- depends = ros-indigo-ros-core
+ depends = ros-indigo-dynamic-reconfigure
depends = ros-indigo-pluginlib
- source = ros_base::git+https://github.com/ros-gbp/metapackages-release.git#tag=release/indigo/ros_base/1.1.3-0
+ source = ros_base::git+https://github.com/ros-gbp/metapackages-release.git#tag=release/indigo/ros_base/1.1.4-0
md5sums = SKIP
pkgname = ros-indigo-ros-base
diff --git a/PKGBUILD b/PKGBUILD
index c8a0395f5bdb..dacc4264fde7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,7 +4,7 @@ pkgdesc="ROS - A metapackage which extends ros_core and includes other basic non
url='http://www.ros.org/'
pkgname='ros-indigo-ros-base'
-pkgver='1.1.3'
+pkgver='1.1.4'
_pkgver_patch=0
arch=('any')
pkgrel=1
@@ -14,13 +14,12 @@ ros_makedepends=(ros-indigo-catkin)
makedepends=('cmake' 'git' 'ros-build-tools'
${ros_makedepends[@]})
-ros_depends=(ros-indigo-dynamic-reconfigure
+ros_depends=(ros-indigo-ros-core
ros-indigo-nodelet-core
ros-indigo-bond-core
- ros-indigo-common-tutorials
ros-indigo-actionlib
ros-indigo-class-loader
- ros-indigo-ros-core
+ ros-indigo-dynamic-reconfigure
ros-indigo-pluginlib)
depends=(${ros_depends[@]})
@@ -49,6 +48,7 @@ build() {
-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
-DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
+ -DPYTHON_BASENAME=-python2.7 \
-DSETUPTOOLS_DEB_LAYOUT=OFF
make
}