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.

.SRCINFO

@@ -1,15 +1,15 @@
 pkgbase = ros-indigo-genlisp
 	pkgdesc = ROS - Common-Lisp ROS message and service generators.
 	pkgver = 0.4.13
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.ros.org/wiki/roslisp
 	arch = any
 	license = BSD
 	makedepends = cmake
 	makedepends = git
 	makedepends = ros-build-tools
-	makedepends = ros-indigo-catkin
 	makedepends = ros-indigo-genmsg
+	makedepends = ros-indigo-catkin
 	depends = ros-indigo-genmsg
 	source = genlisp::git+https://github.com/ros-gbp/genlisp-release.git#tag=release/indigo/genlisp/0.4.13-0
 	md5sums = SKIP

PKGBUILD

@@ -7,11 +7,11 @@ pkgname='ros-indigo-genlisp'
 pkgver='0.4.13'
 _pkgver_patch=0
 arch=('any')
-pkgrel=1
+pkgrel=2
 license=('BSD')
 
-ros_makedepends=(ros-indigo-catkin
-  ros-indigo-genmsg)
+ros_makedepends=(ros-indigo-genmsg
+  ros-indigo-catkin)
 makedepends=('cmake' 'git' 'ros-build-tools'
   ${ros_makedepends[@]})
 
@@ -33,16 +33,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
 }