Unity

Merge lp:~timo-jyrinki/unity/get_xpathselect_1.4_back into lp:unity

  1. get_xpathselect_1.4_back
  2. Merge into trunk
Proposed by Timo Jyrinki
Status: Merged
Merged at revision: 3588
Proposed branch: lp:~timo-jyrinki/unity/get_xpathselect_1.4_back
Merge into: lp:unity
Diff against target: 34 lines (+3/-3)
2 files modified
CMakeLists.txt (+1/-1)
debian/control (+2/-2)
To merge this branch: bzr merge lp:~timo-jyrinki/unity/get_xpathselect_1.4_back
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Needs Fixing
Unity Team Pending
Review via email: mp+194069@code.launchpad.net

Commit message

Depend on xpathselect1.4 support again.

Description of the change

To be merged only after https://code.launchpad.net/~3v1n0/unity/xpathselect-1.4/+merge/186092 has been merged.

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

FAILED: Continuous integration, rev:3588
http://jenkins.qa.ubuntu.com/job/unity-ci/489/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/20/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/20/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/489/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

FAILED: Continuous integration, rev:3589
http://jenkins.qa.ubuntu.com/job/unity-ci/490/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-amd64-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-armhf-ci/21/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-trusty-i386-ci/21/console

Click here to trigger a rebuild:
http://10.97.0.26:8080/job/unity-ci/490/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Timo Jyrinki (timo-jyrinki) wrote :

Is part of https://code.launchpad.net/~timo-jyrinki/unity/xpathselect-1.4/+merge/194077

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'CMakeLists.txt'
--- CMakeLists.txt 2013-10-29 20:50:07 +0000
+++ CMakeLists.txt 2013-11-06 06:52:34 +0000
@@ -233,7 +233,7 @@
233 nux-4.0>=4.0.1233 nux-4.0>=4.0.1
234 sigc++-2.0234 sigc++-2.0
235 unity-misc>=0.4.0235 unity-misc>=0.4.0
236 xpathselect>=1.2236 xpathselect=1.4
237 zeitgeist-2.0237 zeitgeist-2.0
238)238)
239239
240240
=== modified file 'debian/control'
--- debian/control 2013-10-29 20:50:07 +0000
+++ debian/control 2013-11-06 06:52:34 +0000
@@ -48,7 +48,7 @@
48 libxcb-icccm4-dev,48 libxcb-icccm4-dev,
49 libxfixes-dev (>= 1:5.0.1-1),49 libxfixes-dev (>= 1:5.0.1-1),
50 libxi-dev (>= 2:1.7.1.901),50 libxi-dev (>= 2:1.7.1.901),
51 libxpathselect-dev (>=1.3),51 libxpathselect-dev (>=1.4),
52 libzeitgeist-2.0-dev,52 libzeitgeist-2.0-dev,
53 pkg-config,53 pkg-config,
54 python (>= 2.7),54 python (>= 2.7),
@@ -178,7 +178,7 @@
178 python-testtools,178 python-testtools,
179 python-xdg,179 python-xdg,
180 python-xlib,180 python-xlib,
181 libxpathselect1.3 (>= 1.3),181 libxpathselect1.4 (>= 1.4),
182Description: Autopiloted tests for Unity182Description: Autopiloted tests for Unity
183 We test Unity automatically through autopilot, a framework which enables us183 We test Unity automatically through autopilot, a framework which enables us
184 to trigger keyboard and mouse events on the fly as well as introspecting184 to trigger keyboard and mouse events on the fly as well as introspecting