summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenjamin Chrétien2014-10-23 11:12:48 +0200
committerBenjamin Chrétien2015-06-20 02:25:13 +0900
commit256368d2a21237bc830f05b676baac6fe97c4d14 (patch)
tree0fbdb98a7b08b780af2f51314a0cb8010e9969e9
parent6bfb33a912cca44418042e77b969ebc867a372ae (diff)
downloadaur-256368d2a21237bc830f05b676baac6fe97c4d14.tar.gz
indigo: desktop_full update.
Also fix PySide support error in import_catkin_packages.py.
-rw-r--r--.SRCINFO4
-rw-r--r--PKGBUILD4
-rwxr-xr-ximport_catkin_packages.py6
3 files changed, 7 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 147c4086890c..5dc10dfa5a8a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = ros-build-tools
pkgdesc = Utilities for building arch packages for ROS stacks.
pkgver = 0.1.0
- pkgrel = 3
+ pkgrel = 4
url = http://www.ros.org
arch = i686
arch = x86_64
@@ -28,7 +28,7 @@ pkgbase = ros-build-tools
md5sums = d257f7f20384e894b0431ee61068aa96
md5sums = 563c9d1320a3a997db25d3087303dcfb
md5sums = 8d6d7eb89a12c449497b209f1a06655b
- md5sums = 02c47940a12ad713ee220978635ef117
+ md5sums = 303d4d13848e1e2ab6a477635ae26e3e
md5sums = 07f5253eb3f8cb5295c32026a20ab6c0
pkgname = ros-build-tools
diff --git a/PKGBUILD b/PKGBUILD
index 941c10b5dec6..3529e1baf5ed 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ url=http://www.ros.org
pkgname='ros-build-tools'
pkgver='0.1.0'
arch=('i686' 'x86_64')
-pkgrel=3
+pkgrel=4
license=('BSD')
makedepends=()
depends=()
@@ -48,5 +48,5 @@ md5sums=('ed01573e0ecc0f7ca451d7e2849cc5ee'
'd257f7f20384e894b0431ee61068aa96'
'563c9d1320a3a997db25d3087303dcfb'
'8d6d7eb89a12c449497b209f1a06655b'
- '02c47940a12ad713ee220978635ef117'
+ '303d4d13848e1e2ab6a477635ae26e3e'
'07f5253eb3f8cb5295c32026a20ab6c0')
diff --git a/import_catkin_packages.py b/import_catkin_packages.py
index ca96e3b7901f..165f8be67a5e 100755
--- a/import_catkin_packages.py
+++ b/import_catkin_packages.py
@@ -291,10 +291,10 @@ package() {
python_version_full = "%s%s" % (python_version_full, "m")
# PYTHON_BASENAME for PySide:
- # If Python 2.7
- python_basename = "-lpython2.7"
+ # If Python 2.7: PySideConfig{-python2.7}.cmake
+ python_basename = "-python2.7"
if python_version_major == "3":
- # If Python 3.4: .cpython-34m
+ # If Python 3.4: PySideConfig{.cpython-34m}.cmake
python_basename = ".cpython-%s" % (python_version_full.replace(".", ""))