Unity

Merge lp:~3v1n0/unity/proper-multiarch into lp:unity

  1. proper-multiarch
  2. Merge into trunk
Proposed by Marco Trevisan (Treviño) on 2016-02-09
Status: Merged
Approved by: Andrea Azzarone on 2016-02-09
Approved revision: 4071
Merged at revision: 4072
Proposed branch: lp:~3v1n0/unity/proper-multiarch
Merge into: lp:unity
Diff against target: 543 lines (+92/-69)
21 files modified
CMakeLists.txt (+26/-14)
UnityCore/CMakeLists.txt (+8/-8)
UnityCore/DBusIndicators.cpp (+1/-1)
config.h.cmake (+3/-2)
dash/previews/StandaloneApplicationPreview.cpp (+18/-17)
dash/previews/StandaloneSocialPreview.cpp (+4/-4)
data/pam/CMakeLists.txt (+1/-1)
debian/libunity-core-6.0-9.install (+1/-1)
debian/rules (+2/-7)
debian/unity-services.install (+1/-1)
debian/unity.install (+1/-1)
gnome/CMakeLists.txt (+1/-1)
plugins/networkarearegion/CMakeLists.txt (+5/-0)
plugins/unity-mt-grab-handles/CMakeLists.txt (+5/-0)
plugins/unityshell/CMakeLists.txt (+6/-1)
services/CMakeLists.txt (+3/-3)
services/unity-panel-service-lockscreen.conf.in (+1/-1)
services/unity-panel-service.conf.in (+1/-1)
tests/test_previews_application.cpp (+1/-1)
tools/CMakeLists.txt (+2/-3)
unity-shared/DashStyle.cpp (+1/-1)
To merge this branch: bzr merge lp:~3v1n0/unity/proper-multiarch
Reviewer Review Type Date Requested Status
PS Jenkins bot continuous-integration Approve on 2016-02-09
Andrea Azzarone 2016-02-09 Approve on 2016-02-09
Review via email: mp+285426@code.launchpad.net

Commit Message

CMake: use GNUInstallDirs with native multi-arch support

We can now use CMAKE_INSTALL_*DIR instead of defining them manually.
Also disable networkarea region plugin build by default.

To post a comment you must log in.
lp:~3v1n0/unity/proper-multiarch updated on 2016-02-09
4069. By Marco Trevisan (Treviño) on 2016-02-09

CMake: use GNUInstallDirs with native multi-arch support

We can now use CMAKE_INSTALL_*DIR instead of defining them manually.
Also disable networkarea region plugin build by default.

4070. By Marco Trevisan (Treviño) on 2016-02-09

CMakeLists: use ${PROJECT_NAME} instead of unity

4071. By Marco Trevisan (Treviño) on 2016-02-09

Use proper prefixes where possible

Andrea Azzarone (azzar1) wrote :

+1

review: Approve
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2015-12-17 15:35:11 +0000
3+++ CMakeLists.txt 2016-02-09 01:58:26 +0000
4@@ -3,6 +3,7 @@
5
6 include (cmake/Documentation.cmake)
7 include (cmake/pch.cmake)
8+include (GNUInstallDirs)
9
10 #
11 # Base bits
12@@ -38,6 +39,12 @@
13 ON
14 )
15
16+option(
17+ ENABLE_NETWORKAREAREGION_PLUGIN
18+ "Enable Unity Network Area region Plugin"
19+ OFF
20+)
21+
22 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
23 set (PIC_FLAGS "-fPIC")
24 endif()
25@@ -74,7 +81,7 @@
26 message(FATAL_ERROR "Cannot enable coverage targets because gcovr was not found.")
27 else ()
28 message (STATUS "Enabling XML coverage report")
29- add_custom_target (coverage-xml
30+ add_custom_target (coverage-xml
31 COMMAND "${GCOVR_EXECUTABLE}" --exclude="tests.*" --exclude="obj-.*" -x -r "${CMAKE_SOURCE_DIR}" -o "${COVERAGE_XML_FILE}")
32 endif()
33
34@@ -87,7 +94,7 @@
35 # message(FATAL_ERROR "Cannot enable coverage targets because genhtml was not found.")
36 # else ()
37 # message (STATUS "Enabling HTML coverage report")
38-# add_custom_target (coverage-html
39+# add_custom_target (coverage-html
40 # COMMAND "${LCOV_EXECUTABLE}" --directory "${CMAKE_BINARY_DIR}" --capture --output-file "${COVERAGE_INFO_FILE}"
41 # COMMAND "${GENHTML_EXECUTABLE}" --output-directory "${COVERAGE_HTML_DIR}" "${COVERAGE_INFO_FILE}")
42 # endif()
43@@ -149,15 +156,16 @@
44 #
45 # config.h
46 #
47-set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}")
48-set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
49-set (PKGDATADIR "${DATADIR}/unity/icons")
50+set (VERSION "${UNITY_VERSION}")
51+set (PREFIXPATH "${CMAKE_INSTALL_PREFIX}")
52+set (UNITYLIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}")
53+set (UNITYDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}")
54+set (PKGDATADIR "${UNITYDATADIR}/icons")
55 set (SOURCEDATADIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
56-set (GETTEXT_PACKAGE "unity")
57-set (LOCALE_DIR "${DATADIR}/locale")
58-set (VERSION "${UNITY_VERSION}")
59 set (BUILDDIR "${CMAKE_BINARY_DIR}")
60 set (TESTDATADIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
61+set (LOCALE_DIR "${CMAKE_INSTALL_FULL_LOCALEDIR}")
62+set (GETTEXT_PACKAGE "${PROJECT_NAME}")
63
64 find_package (PkgConfig)
65 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gtk+-3.0 --variable prefix OUTPUT_VARIABLE GTK_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
66@@ -165,7 +173,7 @@
67 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE INDICATORDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
68 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE INDICATORICONDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
69 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable prefix OUTPUT_VARIABLE INDICATORPREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
70-set (INDICATOR_SERVICE_DIR "${INDICATORPREFIX}/share/unity/indicators")
71+set (INDICATOR_SERVICE_DIR "${INDICATORPREFIX}/share/${PROJECT_NAME}/indicators")
72
73 configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
74
75@@ -177,8 +185,8 @@
76
77 set (COMPIZ_I18N_DIR ${CMAKE_SOURCE_DIR}/po)
78
79-add_custom_command (OUTPUT ${CMAKE_SOURCE_DIR}/po/unity.pot
80- COMMAND xgettext -c --from-code=UTF-8 --files-from ${CMAKE_SOURCE_DIR}/po/POTFILES.in --keyword=_ -o ${CMAKE_SOURCE_DIR}/po/unity.pot --copyright-holder="Canonical Ltd" --msgid-bugs-address="ayatana-dev@lists.launchpad.net" --no-wrap --no-location
81+add_custom_command (OUTPUT ${CMAKE_SOURCE_DIR}/po/${PROJECT_NAME}.pot
82+ COMMAND xgettext -c --from-code=UTF-8 --files-from ${CMAKE_SOURCE_DIR}/po/POTFILES.in --keyword=_ -o ${CMAKE_SOURCE_DIR}/po/${PROJECT_NAME}.pot --copyright-holder="Canonical Ltd" --msgid-bugs-address="ayatana-dev@lists.launchpad.net" --no-wrap --no-location
83 WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
84 )
85
86@@ -274,11 +282,15 @@
87 add_subdirectory(panel)
88 add_subdirectory(decorations)
89 add_subdirectory(plugins/unityshell)
90- add_subdirectory(plugins/networkarearegion)
91 add_subdirectory(plugins/unity-mt-grab-handles)
92 add_subdirectory(shortcuts)
93 add_subdirectory(shutdown)
94 add_subdirectory(unity-standalone)
95+
96+ if (ENABLE_NETWORKAREAREGION_PLUGIN)
97+ add_subdirectory(plugins/networkarearegion)
98+ endif (ENABLE_NETWORKAREAREGION_PLUGIN)
99+
100 endif ()
101
102 add_subdirectory(doc)
103@@ -355,7 +367,7 @@
104 # Have an option to not install the schema into where GLib is
105 option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" OFF)
106 if (GSETTINGS_LOCALINSTALL)
107- SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
108+ SET (GSETTINGS_DIR "${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas/")
109 else (GSETTINGS_LOCALINSTALL)
110 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
111 SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
112@@ -376,7 +388,7 @@
113 install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
114
115 # Resources
116-install (FILES resources/dash-widgets.json DESTINATION ${CMAKE_INSTALL_PREFIX}/share/unity/themes)
117+install (FILES resources/dash-widgets.json DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/themes)
118 file (GLOB _datafiles "${CMAKE_CURRENT_SOURCE_DIR}/resources/*")
119 install (FILES ${_datafiles} DESTINATION ${PKGDATADIR})
120
121
122=== modified file 'UnityCore/CMakeLists.txt'
123--- UnityCore/CMakeLists.txt 2015-09-29 23:57:40 +0000
124+++ UnityCore/CMakeLists.txt 2016-02-09 01:58:26 +0000
125@@ -149,22 +149,22 @@
126 add_pch(pch/unitycore_pch.hh ${CORE_LIB_NAME})
127
128 install (TARGETS ${CORE_LIB_NAME}
129- RUNTIME DESTINATION bin
130- ARCHIVE DESTINATION lib
131- LIBRARY DESTINATION lib
132+ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
133+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
134+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
135 )
136
137 #
138 # Headers
139 #
140-install (FILES ${CORE_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Unity-${UNITY_API_VERSION}/UnityCore)
141+install (FILES ${CORE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Unity-${UNITY_API_VERSION}/UnityCore)
142
143 #
144 # PkgConfig file
145 #
146-set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
147-set (LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
148-set (INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
149+set (EXEC_PREFIX "${CMAKE_INSTALL_LIBEXECDIR}")
150+set (LIBDIR "${CMAKE_INSTALL_LIBDIR}")
151+set (INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
152
153 configure_file (unity-core.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIB_NAME}.pc @ONLY)
154-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
155+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)
156
157=== modified file 'UnityCore/DBusIndicators.cpp'
158--- UnityCore/DBusIndicators.cpp 2015-10-01 17:17:15 +0000
159+++ UnityCore/DBusIndicators.cpp 2016-02-09 01:58:26 +0000
160@@ -123,7 +123,7 @@
161
162 // This is obviously hackish, but this part of the code is mostly hackish...
163 // Let's attempt to run it from where we expect it to be
164- std::string cmd = PREFIXDIR + std::string("/lib/unity/unity-panel-service");
165+ std::string cmd = UNITYLIBDIR"/" + std::string("unity-panel-service");
166 LOG_WARN(logger) << "Couldn't load panel from installed services, "
167 << "so trying to load panel from known location: " << cmd;
168
169
170=== modified file 'config.h.cmake'
171--- config.h.cmake 2014-01-16 13:20:16 +0000
172+++ config.h.cmake 2016-02-09 01:58:26 +0000
173@@ -1,8 +1,9 @@
174 #ifndef CONFIG_H
175 #define CONFIG_H
176
177-#cmakedefine PREFIXDIR "@PREFIXDIR@"
178-#cmakedefine DATADIR "@DATADIR@"
179+#cmakedefine PREFIXPATH "@PREFIXPATH@"
180+#cmakedefine UNITYDATADIR "@UNITYDATADIR@"
181+#cmakedefine UNITYLIBDIR "@UNITYLIBDIR@"
182 #cmakedefine PKGDATADIR "@PKGDATADIR@"
183 #cmakedefine LOCALE_DIR "@LOCALE_DIR@"
184 #cmakedefine VERSION "@VERSION@"
185
186=== modified file 'dash/previews/StandaloneApplicationPreview.cpp'
187--- dash/previews/StandaloneApplicationPreview.cpp 2014-07-08 16:50:54 +0000
188+++ dash/previews/StandaloneApplicationPreview.cpp 2016-02-09 01:58:26 +0000
189@@ -17,7 +17,8 @@
190 * Authored by: Nick Dedekind <nick.dedekind@canonical.com>
191 *
192 */
193-#include <gtk/gtk.h>
194+
195+#include "config.h"
196
197 #include "Nux/Nux.h"
198 #include "Nux/VLayout.h"
199@@ -165,23 +166,23 @@
200 description << "Application description " << i << std::endl;
201
202 // creates a generic preview object
203- glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-music.svg", NULL));
204- glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
205- glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-people.svg", NULL));
206+ glib::Object<GIcon> iconHint1(g_icon_new_for_string(PKGDATADIR"/lens-nav-music.svg", NULL));
207+ glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
208+ glib::Object<GIcon> iconHint3(g_icon_new_for_string(PKGDATADIR"/lens-nav-people.svg", NULL));
209
210 GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
211 g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
212
213 glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
214
215- unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
216+ unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string(PKGDATADIR "/launcher_bfb.png", NULL));
217 unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Proprietary");
218 unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "(c) Skype 2012");
219 unity_protocol_application_preview_set_last_update(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "11th Apr 2012");
220 unity_protocol_application_preview_set_rating(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 0.5);
221 unity_protocol_application_preview_set_num_ratings(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 17);
222
223- unity_protocol_preview_set_image_source_uri(proto_obj, "file:///home/nick/Skype.png");
224+ unity_protocol_preview_set_image_source_uri(proto_obj, "file://" PKGDATADIR "/launcher_bfb.png");
225 unity_protocol_preview_set_title(proto_obj, app_name.str().c_str());
226 unity_protocol_preview_set_subtitle(proto_obj, subtitle);
227 unity_protocol_preview_set_description(proto_obj, description.str().c_str());
228@@ -210,24 +211,24 @@
229 The service allows users to communicate with peers by voice, video, and instant messaging over the Internet. Phone calls may be placed to recipients on the traditional telephone networks. Calls to other users within the Skype service are free of charge, while calls to landline telephones and mobile phones are charged via a debit-based user account system.";
230
231 // creates a generic preview object
232- glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-music.svg", NULL));
233- glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
234- glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-people.svg", NULL));
235- glib::Object<GIcon> iconHint4(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-people.svg", NULL));
236+ glib::Object<GIcon> iconHint1(g_icon_new_for_string(PKGDATADIR"/lens-nav-music.svg", NULL));
237+ glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
238+ glib::Object<GIcon> iconHint3(g_icon_new_for_string(PKGDATADIR"/lens-nav-people.svg", NULL));
239+ glib::Object<GIcon> iconHint4(g_icon_new_for_string(PKGDATADIR"/lens-nav-people.svg", NULL));
240
241 GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
242 g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
243
244 glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
245
246- unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
247+ unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string(PKGDATADIR "/launcher_bfb.png", NULL));
248 unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Proprietary");
249 unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "(c) Skype 2012");
250 unity_protocol_application_preview_set_last_update(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "11th Apr 2012");
251 unity_protocol_application_preview_set_rating(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 0.25);
252 unity_protocol_application_preview_set_num_ratings(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 5);
253
254- unity_protocol_preview_set_image_source_uri(proto_obj, "file:///home/nick/Skype.png");
255+ unity_protocol_preview_set_image_source_uri(proto_obj, "file://" PKGDATADIR "/launcher_bfb.png");
256 unity_protocol_preview_set_title(proto_obj, app_name.str().c_str());
257 unity_protocol_preview_set_subtitle(proto_obj, subtitle);
258 unity_protocol_preview_set_description(proto_obj, description);
259@@ -262,9 +263,9 @@
260 The service allows users to communicate with peers by voice, video, and instant messaging over the Internet. Phone calls may be placed to recipients on the traditional telephone networks. Calls to other users within the Skype service are free of charge, while calls to landline telephones and mobile phones are charged via a debit-based user account system.";
261
262 // creates a generic preview object
263- glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-music.svg", NULL));
264- glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
265- glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-people.svg", NULL));
266+ glib::Object<GIcon> iconHint1(g_icon_new_for_string(PKGDATADIR"/lens-nav-music.svg", NULL));
267+ glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
268+ glib::Object<GIcon> iconHint3(g_icon_new_for_string(PKGDATADIR"/lens-nav-people.svg", NULL));
269
270 GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
271 g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
272@@ -272,14 +273,14 @@
273 glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
274
275
276- unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
277+ unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string(PKGDATADIR"/launcher_bfb.png", NULL));
278 unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Proprietary");
279 unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "(c) Skype 2012");
280 unity_protocol_application_preview_set_last_update(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "11th Apr 2012");
281 unity_protocol_application_preview_set_rating(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 0.8);
282 unity_protocol_application_preview_set_num_ratings(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 1223);
283
284- unity_protocol_preview_set_image_source_uri(proto_obj, "file:///home/nick/Skype.png");
285+ unity_protocol_preview_set_image_source_uri(proto_obj, "file://" PKGDATADIR "/launcher_bfb.png");
286 unity_protocol_preview_set_title(proto_obj, app_name.str().c_str());
287 unity_protocol_preview_set_subtitle(proto_obj, subtitle);
288 unity_protocol_preview_set_description(proto_obj, description);
289
290=== modified file 'dash/previews/StandaloneSocialPreview.cpp'
291--- dash/previews/StandaloneSocialPreview.cpp 2014-07-08 16:50:54 +0000
292+++ dash/previews/StandaloneSocialPreview.cpp 2016-02-09 01:58:26 +0000
293@@ -17,7 +17,7 @@
294 * Authored by: Nick Dedekind <nick.dedekind@canonical.com>
295 *
296 */
297-#include <gtk/gtk.h>
298+#include "config.h"
299
300 #include "Nux/Nux.h"
301 #include "Nux/VLayout.h"
302@@ -159,7 +159,7 @@
303 const char* description = "Lorem ipsum dolor sit amet, id eruditi referrentur cum, et est enim persequeris. Munere docendi intellegebat pro id, nam no delenit facilisis similique, ut usu eros aliquando. Electram postulant accusamus ut ius, cum ad impedit facilis mediocrem. At cum tamquam.";
304
305 glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/pixmaps/faces/sunflower.jpg", NULL));
306- glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
307+ glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
308 glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/icons/unity-icon-theme/places/svg/service-twitter.svg", NULL));
309
310 glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_social_preview_new()));
311@@ -193,7 +193,7 @@
312
313 // creates a generic preview object
314 glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/pixmaps/faces/astronaut.jpg", NULL));
315- glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
316+ glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
317
318 glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_social_preview_new()));
319
320@@ -228,7 +228,7 @@
321 const char* description = "Profile pictures are what people want them to think they look like. Tagged pictures are what they really look like.";
322
323 glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/pixmaps/faces/soccerball.png", NULL));
324- glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
325+ glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
326
327 glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_social_preview_new()));
328
329
330=== modified file 'data/pam/CMakeLists.txt'
331--- data/pam/CMakeLists.txt 2014-06-19 15:54:27 +0000
332+++ data/pam/CMakeLists.txt 2016-02-09 01:58:26 +0000
333@@ -1,1 +1,1 @@
334-install(FILES unity DESTINATION ${CMAKE_SYSCONFDIR}/pam.d)
335\ No newline at end of file
336+install(FILES unity DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/pam.d)
337
338=== modified file 'debian/libunity-core-6.0-9.install'
339--- debian/libunity-core-6.0-9.install 2016-02-08 20:34:08 +0000
340+++ debian/libunity-core-6.0-9.install 2016-02-09 01:58:26 +0000
341@@ -1,5 +1,5 @@
342 usr/lib/*/libunity-core*.so.*
343-usr/lib/unity/*.py
344+usr/lib/*/unity/*.py
345 usr/share/ccsm
346 usr/share/gnome-control-center/
347 usr/share/unity
348
349=== modified file 'debian/rules'
350--- debian/rules 2016-02-08 20:34:08 +0000
351+++ debian/rules 2016-02-09 01:58:26 +0000
352@@ -23,7 +23,7 @@
353 LIBUNITY_PRIVATE := $(shell pkg-config --libs-only-L unity-protocol-private | sed -e 's/-L\(.*\)/\1/' )
354 SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/unity/client-scopes.json)
355
356-cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCMAKE_SYSCONFDIR=/etc -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
357+cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
358 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
359 cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
360 endif
361@@ -39,12 +39,7 @@
362 done; \
363 cd $(CURDIR)
364 find debian/tmp/usr/lib -name \*.*a -exec rm {} \;
365- rm -f debian/tmp/usr/share/compiz/networkarearegion.xml
366- rm -f debian/tmp//usr/lib/compiz/libnetworkarearegion.so
367- rm -rf debian/tmp/usr/share/gconf/schemas/
368- mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
369- mv debian/tmp/usr/lib/lib*so* debian/tmp/usr/lib/pkgconfig \
370- debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
371+ rm -rf debian/tmp/usr/share/gconf/schemas
372 dh_install --fail-missing
373
374 override_dh_gencontrol:
375
376=== modified file 'debian/unity-services.install'
377--- debian/unity-services.install 2013-06-17 11:16:12 +0000
378+++ debian/unity-services.install 2016-02-09 01:58:26 +0000
379@@ -1,3 +1,3 @@
380-usr/lib/unity/*service
381+usr/lib/*/unity/*service
382 usr/share/upstart
383 usr/share/man/*/unity-panel-service.1
384
385=== modified file 'debian/unity.install'
386--- debian/unity.install 2014-06-19 20:24:13 +0000
387+++ debian/unity.install 2016-02-09 01:58:26 +0000
388@@ -1,6 +1,6 @@
389 etc/pam.d
390 usr/bin
391-usr/lib/compiz
392+usr/lib/*/compiz/libunity*.so
393 usr/share/man/*/unity.1
394 usr/share/compiz
395 usr/share/locale
396
397=== modified file 'gnome/CMakeLists.txt'
398--- gnome/CMakeLists.txt 2012-08-17 08:29:45 +0000
399+++ gnome/CMakeLists.txt 2016-02-09 01:58:26 +0000
400@@ -6,7 +6,7 @@
401 ${CMAKE_CURRENT_BINARY_DIR}/50-unity-launchers.xml NOTRANSLATIONS)
402
403 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/50-unity-launchers.xml
404- DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gnome-control-center/keybindings)
405+ DESTINATION ${CMAKE_INSTALL_DATADIR}/gnome-control-center/keybindings)
406
407 add_custom_target (unity-gnome-keybindings ALL DEPENDS
408 ${CMAKE_CURRENT_BINARY_DIR}/50-unity-launchers.xml)
409
410=== modified file 'plugins/networkarearegion/CMakeLists.txt'
411--- plugins/networkarearegion/CMakeLists.txt 2013-01-08 09:07:52 +0000
412+++ plugins/networkarearegion/CMakeLists.txt 2016-02-09 01:58:26 +0000
413@@ -8,6 +8,11 @@
414 set(revert_compiz TRUE)
415 endif()
416
417+set (libdir ${CMAKE_INSTALL_LIBDIR})
418+set (includedir ${CMAKE_INSTALL_INCLUDEDIR})
419+set (libdir ${CMAKE_INSTALL_LIBDIR})
420+set (datadir ${CMAKE_INSTALL_FULL_DATADIR})
421+
422 compiz_plugin (networkarearegion)
423
424 if(revert_compiz)
425
426=== modified file 'plugins/unity-mt-grab-handles/CMakeLists.txt'
427--- plugins/unity-mt-grab-handles/CMakeLists.txt 2013-01-08 09:07:52 +0000
428+++ plugins/unity-mt-grab-handles/CMakeLists.txt 2016-02-09 01:58:26 +0000
429@@ -8,6 +8,11 @@
430 set(revert_compiz TRUE)
431 endif()
432
433+set (libdir ${CMAKE_INSTALL_LIBDIR})
434+set (includedir ${CMAKE_INSTALL_INCLUDEDIR})
435+set (libdir ${CMAKE_INSTALL_LIBDIR})
436+set (datadir ${CMAKE_INSTALL_FULL_DATADIR})
437+
438 compiz_plugin (unitymtgrabhandles PKGDEPS nux-4.0>=4.0.0 PLUGINDEPS composite opengl CFLAGSADD -std=c++0x)
439
440 if(revert_compiz)
441
442=== modified file 'plugins/unityshell/CMakeLists.txt'
443--- plugins/unityshell/CMakeLists.txt 2015-12-17 15:35:11 +0000
444+++ plugins/unityshell/CMakeLists.txt 2016-02-09 01:58:26 +0000
445@@ -10,6 +10,11 @@
446 set(revert_compiz TRUE)
447 endif()
448
449+set (libdir ${CMAKE_INSTALL_LIBDIR})
450+set (includedir ${CMAKE_INSTALL_INCLUDEDIR})
451+set (libdir ${CMAKE_INSTALL_LIBDIR})
452+set (datadir ${CMAKE_INSTALL_FULL_DATADIR})
453+
454 compiz_plugin (unityshell
455 PKGDEPS ${UNITY_PLUGIN_DEPS}
456 PLUGINDEPS composite opengl compiztoolbox scale
457@@ -50,4 +55,4 @@
458 #
459 # Data
460 #
461-install (FILES plugin-unityshell.png DESTINATION ${DATADIR}/ccsm/icons/hicolor/64x64/apps)
462+install (FILES plugin-unityshell.png DESTINATION ${COMPIZ_DATADIR}/ccsm/icons/hicolor/64x64/apps)
463
464=== modified file 'services/CMakeLists.txt'
465--- services/CMakeLists.txt 2014-11-04 19:00:40 +0000
466+++ services/CMakeLists.txt 2016-02-09 01:58:26 +0000
467@@ -51,10 +51,10 @@
468
469 add_executable(unity-panel-service ${PANEL_SOURCES})
470 target_link_libraries(unity-panel-service ${LIBS})
471-install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/unity/)
472+install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/)
473
474 configure_file(unity-panel-service.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf)
475-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions)
476+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
477
478 configure_file(unity-panel-service-lockscreen.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf)
479-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions)
480+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
481
482=== modified file 'services/unity-panel-service-lockscreen.conf.in'
483--- services/unity-panel-service-lockscreen.conf.in 2014-02-10 16:57:22 +0000
484+++ services/unity-panel-service-lockscreen.conf.in 2016-02-09 01:58:26 +0000
485@@ -5,4 +5,4 @@
486 stop on desktop-unlock
487
488 respawn
489-exec ${CMAKE_INSTALL_PREFIX}/lib/unity/unity-panel-service --lockscreen-mode
490\ No newline at end of file
491+exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service --lockscreen-mode
492
493=== modified file 'services/unity-panel-service.conf.in'
494--- services/unity-panel-service.conf.in 2014-02-07 15:26:22 +0000
495+++ services/unity-panel-service.conf.in 2016-02-09 01:58:26 +0000
496@@ -15,4 +15,4 @@
497 emits indicator-services-end
498
499 respawn
500-exec ${CMAKE_INSTALL_PREFIX}/lib/unity/unity-panel-service
501+exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service
502
503=== modified file 'tests/test_previews_application.cpp'
504--- tests/test_previews_application.cpp 2014-03-21 04:40:12 +0000
505+++ tests/test_previews_application.cpp 2016-02-09 01:58:26 +0000
506@@ -72,7 +72,7 @@
507 GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
508 g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
509
510- unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
511+ unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string(TESTDATADIR "/bfb.png", NULL));
512 unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "License & special char");
513 unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Copywrite & special char");
514 unity_protocol_application_preview_set_last_update(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "11th Apr 2012");
515
516=== modified file 'tools/CMakeLists.txt'
517--- tools/CMakeLists.txt 2012-06-25 07:28:00 +0000
518+++ tools/CMakeLists.txt 2016-02-09 01:58:26 +0000
519@@ -1,9 +1,8 @@
520 #
521 # Some unity tools
522 #
523-install(FILES makebootchart.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/unity/)
524+install(FILES makebootchart.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity)
525
526 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity.cmake ${CMAKE_BINARY_DIR}/bin/unity)
527 install(FILES ${CMAKE_BINARY_DIR}/bin/unity PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
528-GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION bin)
529-
530+GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_BINDIR})
531
532=== modified file 'unity-shared/DashStyle.cpp'
533--- unity-shared/DashStyle.cpp 2014-08-27 12:55:17 +0000
534+++ unity-shared/DashStyle.cpp 2016-02-09 01:58:26 +0000
535@@ -46,7 +46,7 @@
536 #include "UnitySettings.h"
537 #include "config.h"
538
539-#define DASH_WIDGETS_FILE DATADIR"/unity/themes/dash-widgets.json"
540+#define DASH_WIDGETS_FILE UNITYDATADIR"/themes/dash-widgets.json"
541
542 namespace unity
543 {