indigo: use Python 2 rather than Python 3.

Since most packages are unlikely to be Python 3 ready before the
next ROS distribution, we stick to Python 2.

2 files changed, 6 insertions, 6 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 1dd258074378..a941ddaa49e4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = ros-indigo-mk
 	pkgdesc = ROS - A collection of .mk include files for building ROS architectural elements.
 	pkgver = 1.11.1
-	pkgrel = 2
+	pkgrel = 3
 	url = http://www.ros.org/wiki/ROS
 	arch = any
 	license = BSD
diff --git a/PKGBUILD b/PKGBUILD
index 89cd4ddce2ba..1667061d2ef5 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@ pkgname='ros-indigo-mk'
 pkgver='1.11.1'
 _pkgver_patch=1
 arch=('any')
-pkgrel=2
+pkgrel=3
 license=('BSD')
 
 ros_makedepends=(ros-indigo-catkin)
@@ -32,16 +32,16 @@ build() {
   cd ${srcdir}/build
 
   # Fix Python2/Python3 conflicts
-  /usr/share/ros-build-tools/fix-python-scripts.sh -v 3 ${srcdir}/${_dir}
+  /usr/share/ros-build-tools/fix-python-scripts.sh -v 2 ${srcdir}/${_dir}
 
   # Build project
   cmake ${srcdir}/${_dir} \
         -DCMAKE_BUILD_TYPE=Release \
         -DCATKIN_BUILD_BINARY_PACKAGE=ON \
         -DCMAKE_INSTALL_PREFIX=/opt/ros/indigo \
-        -DPYTHON_EXECUTABLE=/usr/bin/python3 \
-        -DPYTHON_INCLUDE_DIR=/usr/include/python3.4m \
-        -DPYTHON_LIBRARY=/usr/lib/libpython3.4m.so \
+        -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+        -DPYTHON_INCLUDE_DIR=/usr/include/python2.7 \
+        -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
         -DSETUPTOOLS_DEB_LAYOUT=OFF
   make
 }