Merge lp:~loic.molinari/ubuntu-ui-toolkit/ubuntu-metrics-add-version-to-lttng-plugin-path into lp:ubuntu-ui-toolkit/staging

[Loïc Molinari]

Added version to LTTng plugin path.

That's to avoid broken upgrades on soname bump as required by Ubuntu packaging guidelines (the $$[QT_INSTALL_PLUGINS] doesn't seem to be enough).

Added version to LTTng plugin path.

That's to avoid broken upgrades on soname bump as required by Ubuntu packaging guidelines (the $$[QT_INSTALL_PLUGINS] doesn't seem to be enough).

[Loïc Molinari (loic.molinari)]

Now that's not critical anymore, I think it would be better to use the UITK version instead. Is there a UITK_VERSION variable to be expanded in the .pro?

review: Needs Information

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2084
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1101/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5609/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1101/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2084
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1318/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5610/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1318/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2084
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1068/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5611/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1068/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2084
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1308/
Executed test runs:
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5612/console

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1308/rebuild

review: Approve (continuous-integration)

[ubuntu-sdk-build-bot (ubuntu-sdk-build-bot)]

PASSED: Continuous integration, rev:2084
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/691/
Executed test runs:
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-armhf-stable/1308
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-stable/1318
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-amd64-devel/1101
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci-i386-gles-stable/1068
    None: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5613/console
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5612
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5610
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5609
    SUCCESS: https://jenkins.ubuntu.com/ubuntu-sdk/job/generic-update-mp/5611

Click here to trigger a rebuild:
https://jenkins.ubuntu.com/ubuntu-sdk/job/ubuntu-ui-toolkit-ci/691/rebuild

review: Approve (continuous-integration)

Unmerged revisions

2084. By Loïc Molinari on 2016-08-26

Added version to LTTng plugin path.

=== modified file 'debian/libubuntumetrics5.install'
--- debian/libubuntumetrics5.install	2016-07-26 17:07:42 +0000
+++ debian/libubuntumetrics5.install	2016-08-26 17:56:11 +0000
@@ -1,2 +1,2 @@
 usr/lib/*/libUbuntuMetrics.so.*
-usr/lib/*/qt5/plugins/ubuntu/metrics/libumlttng.so
+usr/lib/*/qt5/plugins/ubuntu/metrics/*/libumlttng.so

=== modified file 'src/Ubuntu/UbuntuMetrics/UbuntuMetrics.pro'
--- src/Ubuntu/UbuntuMetrics/UbuntuMetrics.pro	2016-08-04 22:54:21 +0000
+++ src/Ubuntu/UbuntuMetrics/UbuntuMetrics.pro	2016-08-26 17:56:11 +0000
@@ -9,7 +9,7 @@
     DEFINES += MESA_EGL_NO_X11_HEADERS
 }
 
-DEFINES += LTTNG_PLUGIN_INSTALL_PATH=\\\"$$[QT_INSTALL_PLUGINS]/ubuntu/metrics/libumlttng.so\\\"
+DEFINES += LTTNG_PLUGIN_INSTALL_PATH=\\\"$$[QT_INSTALL_PLUGINS]/ubuntu/metrics/$$[QT_VERSION]/libumlttng.so\\\"
 DEFINES += LTTNG_PLUGIN_BUILD_PATH=\\\"$$OUT_PWD/lttng/libumlttng.so\\\"
 
 load(qt_build_config)

=== modified file 'src/Ubuntu/UbuntuMetrics/lttng/lttng.pro'
--- src/Ubuntu/UbuntuMetrics/lttng/lttng.pro	2016-07-26 11:03:34 +0000
+++ src/Ubuntu/UbuntuMetrics/lttng/lttng.pro	2016-08-26 17:56:11 +0000
@@ -4,5 +4,5 @@
 CONFIG += plugin
 LIBS += -llttng-ust
 SOURCES = tracepoints.c lttng.c
-target.path = $$[QT_INSTALL_PLUGINS]/ubuntu/metrics
+target.path = $$[QT_INSTALL_PLUGINS]/ubuntu/metrics/$$[QT_VERSION]
 INSTALLS += target