Merge lp:~seb128/ubuntu-system-settings/unity-dash-screenshot into lp:ubuntu-system-settings

[Sebastien Bacher]

install a screenshot, to be used in the unity dash

install a screenshot, to be used in the unity dash

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:556
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/578/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/94
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/82
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/82/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/81

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/578/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Hm, I don't like the overloading of PLUGIN_MODULE_DIR here. Please could you use a separate variable (alias PLUGIN_MODULE_DIR to it if you want)?

Also, now that I look at it, this directory scheme seems perverse. Why isn't it just /usr/share/ubuntu-system-settings/? If you don't have a reason I'd like to change it. u-s-s-online-accounts should be changed too as it's not using the variables from the pcfile when it should be.

review: Needs Fixing

[Sebastien Bacher (seb128)]

> Please could you use a separate variable

sure, I'm going to do that

> Why isn't it just /usr/share/ubuntu-system-settings/?

Yeah, I've been thinking the same but just have been too lazy to change it, feel free to do that if you want.

Note that it's you who acked that version [1] ;-)

[1] https://code.launchpad.net/~mardy/ubuntu-system-settings/private-module-dir/+merge/177801

[lp:~seb128/ubuntu-system-settings/unity-dash-screenshot]

557. By Sebastien Bacher on 2014-01-13

rebase on trunk

558. By Sebastien Bacher on 2014-01-13

use a new variable to install the screenshot image

[Sebastien Bacher (seb128)]

I've pushed an update using a new variable, we should change the directory in another merge request (synced with an online account update)

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:558
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/581/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-amd64-ci/97
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/85
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-armhf-ci/85/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-trusty-i386-ci/84

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/581/rebuild

review: Approve (continuous-integration)

[Iain Lane (laney)]

Good!

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-07 10:48:58 +0000
+++ CMakeLists.txt	2014-01-13 14:30:13 +0000
@@ -54,6 +54,7 @@
 set(PLUGIN_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/${PLUGIN_MODULE_DIR_BASE}")
 set(PLUGIN_QML_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_QML_DIR_BASE}")
 set(PLUGIN_PRIVATE_MODULE_DIR "${CMAKE_INSTALL_PREFIX}/${LIBDIR}/${PLUGIN_PRIVATE_MODULE_DIR_BASE}")
+set(SETTINGS_SHARE_DIR "${CMAKE_INSTALL_PREFIX}/${PLUGIN_MANIFEST_DIR_BASE}")
 
 set(ANDR_PROP_LIB -landroid-properties)
 
@@ -68,7 +69,9 @@
 add_subdirectory(src)
 add_subdirectory(tests)
 
-install(FILES ubuntu-system-settings.desktop DESTINATION share/applications)
+configure_file(ubuntu-system-settings.desktop.in ubuntu-system-settings.desktop @ONLY)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-system-settings.desktop DESTINATION share/applications)
+install(FILES screenshot.png DESTINATION ${SETTINGS_SHARE_DIR})
 
 if(cmake_build_type_lower MATCHES coverage)
   ENABLE_COVERAGE_REPORT(TARGETS system-settings FILTER /usr/include ${CMAKE_SOURCE_DIR}/test/* ${CMAKE_BINARY_DIR}/*)

=== added file 'screenshot.png'
Binary files screenshot.png	1970-01-01 00:00:00 +0000 and screenshot.png	2014-01-13 14:30:13 +0000 differ
=== renamed file 'ubuntu-system-settings.desktop' => 'ubuntu-system-settings.desktop.in'
--- ubuntu-system-settings.desktop	2013-10-01 14:56:47 +0000
+++ ubuntu-system-settings.desktop.in	2014-01-13 14:30:13 +0000
@@ -7,6 +7,7 @@
 StartupNotify=true
 Categories=System;
 Keywords=Preferences;Settings;
+X-Screenshot=@SETTINGS_SHARE_DIR@/screenshot.png
 X-Ubuntu-Gettext-Domain=ubuntu-system-settings
 X-Ubuntu-Touch=true
 X-Ubuntu-StageHint=SideStage