Merge lp:~aacid/unity8/scope-tool-dependencies into lp:unity8

[Albert Astals Cid]

Require binaries and .pc files we call from code

unity-scope-tool Depends: +pkg-config, +libunity-scopes-dev

 * Are there any related MPs required for this MP to build/function as expected?
No

 * Did you perform an exploratory manual test run of your code change and any related functionality?
No, deb changes only

 * Did you make sure that your branch does not contain spurious tags?
Yes

 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
Yes

 * If you changed the UI, has there been a design review?
N/A

[Paweł Stołowski (stolowski)]

LGTM, thanks!

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1642
http://jenkins.qa.ubuntu.com/job/unity8-ci/5382/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/1619
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-vivid/546
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-amd64-ci/547
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-vivid-i386-ci/547
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/1437
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1617
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/1617/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/18503

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/5382/rebuild

review: Needs Fixing (continuous-integration)

[Michał Sawicz (saviq)]

Could we not make those build-time instead?

review: Needs Information

[Michał Sawicz (saviq)]

OK, build-time we could get outdated with the paths in case they changed. Until we have a lib to link to, just add a comment in registry-tracker.cpp to explain why we're calling pkg-config.

review: Approve

[lp:~aacid/unity8/scope-tool-dependencies]

1643. By Albert Astals Cid on 2015-03-10

Add fixme

=== modified file 'debian/control'
--- debian/control	2015-02-16 20:03:45 +0000
+++ debian/control	2015-03-10 10:45:25 +0000
@@ -78,6 +78,9 @@
          unity8-private (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends},
+# We do call pkg-config libunity-scopes from the code
+         pkg-config,
+         libunity-scopes-dev,
 Description: Development tool for Unity scopes
  This package contains the development tool for new generation Unity scopes, based
  on Unity8.

=== modified file 'tools/registry-tracker.cpp'
--- tools/registry-tracker.cpp	2014-09-04 16:40:26 +0000
+++ tools/registry-tracker.cpp	2015-03-10 10:45:25 +0000
@@ -75,6 +75,8 @@
         return;
     }
 
+    // FIXME At the moment we use pkg-config but ideally the library
+    // would just have a function that returns these values
     QString scopeInstallDir;
     QString scopeRegistryBin;
     QString scopeRunnerBin;