Merge lp:~nskaggs/ubuntu-terminal-app/working-py3-jenkins into lp:~dpm/ubuntu-terminal-app/merge-plugin

[Nicholas Skaggs]

Fix python3 and jenkins

Fix python3 and jenkins

=== modified file 'debian/control'
--- debian/control	2014-05-06 15:07:24 +0000
+++ debian/control	2014-05-06 18:38:34 +0000
@@ -3,7 +3,7 @@
 Maintainer: Ubuntu App Cats <[e-mail]>
 Build-Depends: cmake,
                debhelper (>= 9),
-               python,
+               python3-all,
                gettext,
                qtbase5-dev,
                qtdeclarative5-dev,
@@ -31,7 +31,7 @@
 Depends: ${misc:Depends},
          ${shlibs:Depends},
          ${misc:Pre-Depends},
-Description: KDE Konsole QML plugin - qml terminal plugin 
+Description: KDE Konsole QML plugin - qml terminal plugin
  Konsole is a terminal emulator from KDE. This is a ported
  version for the Ubuntu Terminal app and does not require KDE.
  .

=== modified file 'tests/autopilot/CMakeLists.txt'
--- tests/autopilot/CMakeLists.txt	2014-02-04 16:10:39 +0000
+++ tests/autopilot/CMakeLists.txt	2014-05-06 18:38:34 +0000
@@ -1,5 +1,5 @@
 if(INSTALL_TESTS)
-execute_process(COMMAND python -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
+execute_process(COMMAND python3 -c "from distutils.sysconfig import get_python_lib; print get_python_lib()"
     OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 
 install(DIRECTORY ${AUTOPILOT_DIR}