Merge lp:~elopio/unity-scope-click/autopilot-install_py3 into lp:unity-scope-click/devel

Proposed by Leo Arias
Status: Merged
Approved by: dobey
Approved revision: 277
Merged at revision: 278
Proposed branch: lp:~elopio/unity-scope-click/autopilot-install_py3
Merge into: lp:unity-scope-click/devel
Diff against target: 27 lines (+2/-2)
2 files modified
autopilot/CMakeLists.txt (+1/-2)
debian/control (+1/-0)
To merge this branch: bzr merge lp:~elopio/unity-scope-click/autopilot-install_py3
Reviewer Review Type Date Requested Status
dobey (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+220982@code.launchpad.net

Commit message

Install the autopilot package in the python3 lib.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
dobey (dobey) wrote :

I think you need to add the python3 dep to debian/control tool.

review: Needs Fixing
277. By Leo Arias

Added python3 to the build-deps.

Revision history for this message
dobey (dobey) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'autopilot/CMakeLists.txt'
2--- autopilot/CMakeLists.txt 2014-05-16 13:09:36 +0000
3+++ autopilot/CMakeLists.txt 2014-05-27 07:24:24 +0000
4@@ -1,10 +1,9 @@
5-set (Python_ADDITIONAL_VERSIONS 2.7)
6 find_package (PythonInterp)
7
8 set (AUTOPILOT_DIR unityclickscope)
9
10 execute_process (
11- COMMAND ${PYTHON_EXECUTABLE} -c "from distutils import sysconfig; print sysconfig.get_python_lib()"
12+ COMMAND python3 -c "from distutils import sysconfig; print(sysconfig.get_python_lib())"
13 COMMAND sed -r -e "s|/usr/(local/)?||g"
14 OUTPUT_VARIABLE PYTHON_PACKAGE_DIR OUTPUT_STRIP_TRAILING_WHITESPACE)
15
16
17=== modified file 'debian/control'
18--- debian/control 2014-05-26 13:25:32 +0000
19+++ debian/control 2014-05-27 07:24:24 +0000
20@@ -14,6 +14,7 @@
21 libunity-api-dev (>= 7.80.7),
22 libunity-scopes-dev (>= 0.4.0),
23 pkg-config,
24+ python3-all,
25 Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
26 Standards-Version: 3.9.5
27 Homepage: https://launchpad.net/unity-scope-click

Subscribers

People subscribed via source and target branches

to all changes: