Merge lp:~macslow/unity-notifications/fix-1256011 into lp:unity-notifications

[Mirco Müller]

Use new plugin-path provided by pkgconfig of libunity-api-dev, thus fixing LP #1256011.

Use new plugin-path provided by pkgconfig of libunity-api-dev, thus fixing LP #1256011.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:190
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/34/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-amd64-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/9/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-i386-ci/9/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-notifications-ci/34/rebuild

review: Needs Fixing (continuous-integration)

[lp:~macslow/unity-notifications/fix-1256011]

191. By Mirco Müller on 2013-12-02

libunity-api-dev needs to be added as a build-dependency too

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:191
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/35/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-amd64-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/10/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-i386-ci/10/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-notifications-ci/35/rebuild

review: Needs Fixing (continuous-integration)

[lp:~macslow/unity-notifications/fix-1256011]

192. By Mirco Müller on 2013-12-02

*sigh*

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:192
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/36/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-amd64-ci/11
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/11
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/11/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-i386-ci/11

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-notifications-ci/36/rebuild

review: Approve (continuous-integration)

[lp:~macslow/unity-notifications/fix-1256011]

193. By Mirco Müller on 2013-12-04

Merged with trunk and fixed conflicts.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:193
http://jenkins.qa.ubuntu.com/job/unity-notifications-ci/38/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-amd64-ci/13
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/13
        deb: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-armhf-ci/13/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-notifications-trusty-i386-ci/13

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-notifications-ci/38/rebuild

review: Approve (continuous-integration)

[Michael Zanetti (mzanetti)]

ack

review: Approve

=== modified file 'debian/control'
--- debian/control	2013-10-03 12:22:56 +0000
+++ debian/control	2013-12-04 12:01:10 +0000
@@ -7,6 +7,7 @@
                pkg-config,
                qtdeclarative5-dev,
                qtbase5-dev-tools,
+               libunity-api-dev,
 # For Qml tests
                qtchooser,
                qt5-default,

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-06-18 08:36:08 +0000
+++ src/CMakeLists.txt	2013-12-04 12:01:10 +0000
@@ -47,12 +47,22 @@
 qt5_use_modules(notifyplugin Widgets DBus Qml)
 qt5_use_modules(notifyclientplugin Widgets DBus Qml)
 
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir_suffix unity-shell-api OUTPUT_VARIABLE SHELL_INSTALL_QML OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(SHELL_INSTALL_QML STREQUAL "")
+    message(FATAL_ERROR "Could not determine plugin installation dir.")
+endif()
+ 
+execute_process(COMMAND ${PKG_CONFIG_EXECUTABLE} --variable=plugindir unity-shell-api OUTPUT_VARIABLE SHELL_PLUGINDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
+if(SHELL_PLUGINDIR STREQUAL "")
+    message(FATAL_ERROR "Could not determine plugin import dir.")
+endif()
+
 install(
   TARGETS notifyplugin notifyclientplugin
-  ARCHIVE DESTINATION ${QT_IMPORTS_DIR}/Unity/Notifications.${SONAME}
-  LIBRARY DESTINATION ${QT_IMPORTS_DIR}/Unity/Notifications.${SONAME}
+  ARCHIVE DESTINATION ${SHELL_PLUGINDIR}/Unity/Notifications
+  LIBRARY DESTINATION ${SHELL_PLUGINDIR}/Unity/Notifications
 )
 
 install(FILES qmldir
-  DESTINATION ${QT_IMPORTS_DIR}/Unity/Notifications.${SONAME}
+  DESTINATION ${SHELL_INSTALL_QML}/Unity/Notifications
 )