Merge lp:~smspillaz/unity/unity.fix_1185226 into lp:unity

[Sam Spilsbury]

Add a pkg-config dependency on xpathselect>=1.2

Technically we depend on xpathselect>=1.3 in debian/control, however
the latest -dev package in the distro claims the version is 1.2 and it
builds just fine with that.

(LP: #1185226)

Add a pkg-config dependency on xpathselect>=1.2

Technically we depend on xpathselect>=1.3 in debian/control, however
the latest -dev package in the distro claims the version is 1.2 and it
builds just fine with that.

(LP: #1185226)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3348
http://jenkins.qa.ubuntu.com/job/unity-ci/104/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-ci/108
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-ci/104
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-ci/104/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/104/rebuild

review: Needs Fixing (continuous-integration)

[Stephen M. Webb (bregma)]

I'm OKing this because it's a correct and needed fix, pending the Jenkins gcov failure being resolved and getting a clean run.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Autolanding.
More details in the following jenkins job:
http://jenkins.qa.ubuntu.com/job/unity-autolanding/77/
Executed test runs:
    SUCCESS: http://s-jenkins:8080/job/generic-cleanup-mbs/106
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-amd64-autolanding/82/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-raring-armhf-autolanding/82
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-raring-i386-autolanding/82/console

review: Needs Fixing (continuous-integration)

[Sam Spilsbury (smspillaz)]

Jenkins couldn't find the gpg key for the ppa its trying to add.

[Francis Ginther (fginther)]

Things appear to be functional again, re-approving.

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-16 23:30:28 +0000
+++ CMakeLists.txt	2013-05-29 01:44:27 +0000
@@ -225,6 +225,7 @@
     nux-4.0>=4.0.1
     sigc++-2.0
     unity-misc>=0.4.0
+    xpathselect>=1.2
     zeitgeist-1.0>=0.3.18
 )