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

[Marco Trevisan (Treviño)]

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.

[Andrea Azzarone (azzar1)]

+1

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:4071
http://jenkins.qa.ubuntu.com/job/unity-ci/1406/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-armhf-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-xenial-i386-ci/56

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

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2015-12-17 15:35:11 +0000
+++ CMakeLists.txt	2016-02-09 01:58:26 +0000
@@ -3,6 +3,7 @@
 
 include (cmake/Documentation.cmake)
 include (cmake/pch.cmake)
+include (GNUInstallDirs)
 
 #
 # Base bits
@@ -38,6 +39,12 @@
   ON
 )
 
+option(
+  ENABLE_NETWORKAREAREGION_PLUGIN
+  "Enable Unity Network Area region Plugin"
+  OFF
+)
+
 if (${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "armv7l" OR ${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64")
   set (PIC_FLAGS "-fPIC")
 endif()
@@ -74,7 +81,7 @@
       message(FATAL_ERROR "Cannot enable coverage targets because gcovr was not found.")
   else ()
       message (STATUS "Enabling XML coverage report")
-      add_custom_target (coverage-xml 
+      add_custom_target (coverage-xml
           COMMAND  "${GCOVR_EXECUTABLE}" --exclude="tests.*" --exclude="obj-.*" -x -r "${CMAKE_SOURCE_DIR}" -o "${COVERAGE_XML_FILE}")
   endif()
 
@@ -87,7 +94,7 @@
 #      message(FATAL_ERROR "Cannot enable coverage targets because genhtml was not found.")
 #  else ()
 #      message (STATUS "Enabling HTML coverage report")
-#      add_custom_target (coverage-html 
+#      add_custom_target (coverage-html
 #          COMMAND "${LCOV_EXECUTABLE}" --directory "${CMAKE_BINARY_DIR}" --capture --output-file "${COVERAGE_INFO_FILE}"
 #          COMMAND "${GENHTML_EXECUTABLE}" --output-directory "${COVERAGE_HTML_DIR}" "${COVERAGE_INFO_FILE}")
 #  endif()
@@ -149,15 +156,16 @@
 #
 # config.h
 #
-set (PREFIXDIR "${CMAKE_INSTALL_PREFIX}")
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/unity/icons")
+set (VERSION "${UNITY_VERSION}")
+set (PREFIXPATH "${CMAKE_INSTALL_PREFIX}")
+set (UNITYLIBDIR "${CMAKE_INSTALL_FULL_LIBDIR}/${PROJECT_NAME}")
+set (UNITYDATADIR "${CMAKE_INSTALL_FULL_DATADIR}/${PROJECT_NAME}")
+set (PKGDATADIR "${UNITYDATADIR}/icons")
 set (SOURCEDATADIR "${CMAKE_CURRENT_SOURCE_DIR}/resources")
-set (GETTEXT_PACKAGE "unity")
-set (LOCALE_DIR "${DATADIR}/locale")
-set (VERSION "${UNITY_VERSION}")
 set (BUILDDIR "${CMAKE_BINARY_DIR}")
 set (TESTDATADIR "${CMAKE_CURRENT_SOURCE_DIR}/tests/data")
+set (LOCALE_DIR "${CMAKE_INSTALL_FULL_LOCALEDIR}")
+set (GETTEXT_PACKAGE "${PROJECT_NAME}")
 
 find_package (PkgConfig)
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gtk+-3.0 --variable prefix OUTPUT_VARIABLE GTK_PREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
@@ -165,7 +173,7 @@
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable indicatordir OUTPUT_VARIABLE INDICATORDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable iconsdir OUTPUT_VARIABLE INDICATORICONDIR OUTPUT_STRIP_TRAILING_WHITESPACE)
 execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} indicator3-0.4 --variable prefix OUTPUT_VARIABLE INDICATORPREFIX OUTPUT_STRIP_TRAILING_WHITESPACE)
-set (INDICATOR_SERVICE_DIR "${INDICATORPREFIX}/share/unity/indicators")
+set (INDICATOR_SERVICE_DIR "${INDICATORPREFIX}/share/${PROJECT_NAME}/indicators")
 
 configure_file (${CMAKE_SOURCE_DIR}/config.h.cmake ${CMAKE_BINARY_DIR}/config.h)
 
@@ -177,8 +185,8 @@
 
 set (COMPIZ_I18N_DIR ${CMAKE_SOURCE_DIR}/po)
 
-add_custom_command (OUTPUT ${CMAKE_SOURCE_DIR}/po/unity.pot
-		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="[e-mail]" --no-wrap --no-location
+add_custom_command (OUTPUT ${CMAKE_SOURCE_DIR}/po/${PROJECT_NAME}.pot
+		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="[e-mail]" --no-wrap --no-location
 		WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
 		)
 
@@ -274,11 +282,15 @@
   add_subdirectory(panel)
   add_subdirectory(decorations)
   add_subdirectory(plugins/unityshell)
-  add_subdirectory(plugins/networkarearegion)
   add_subdirectory(plugins/unity-mt-grab-handles)
   add_subdirectory(shortcuts)
   add_subdirectory(shutdown)
   add_subdirectory(unity-standalone)
+
+  if (ENABLE_NETWORKAREAREGION_PLUGIN)
+    add_subdirectory(plugins/networkarearegion)
+  endif (ENABLE_NETWORKAREAREGION_PLUGIN)
+
 endif ()
 
 add_subdirectory(doc)
@@ -355,7 +367,7 @@
 # Have an option to not install the schema into where GLib is
 option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" OFF)
 if (GSETTINGS_LOCALINSTALL)
-    SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
+    SET (GSETTINGS_DIR "${CMAKE_INSTALL_DATADIR}/glib-2.0/schemas/")
 else (GSETTINGS_LOCALINSTALL)
     execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix  OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
     SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
@@ -376,7 +388,7 @@
 install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
 
 # Resources
-install (FILES resources/dash-widgets.json DESTINATION ${CMAKE_INSTALL_PREFIX}/share/unity/themes)
+install (FILES resources/dash-widgets.json DESTINATION ${CMAKE_INSTALL_DATADIR}/${PROJECT_NAME}/themes)
 file (GLOB _datafiles "${CMAKE_CURRENT_SOURCE_DIR}/resources/*")
 install (FILES ${_datafiles} DESTINATION ${PKGDATADIR})
 

=== modified file 'UnityCore/CMakeLists.txt'
--- UnityCore/CMakeLists.txt	2015-09-29 23:57:40 +0000
+++ UnityCore/CMakeLists.txt	2016-02-09 01:58:26 +0000
@@ -149,22 +149,22 @@
 add_pch(pch/unitycore_pch.hh ${CORE_LIB_NAME})
 
 install (TARGETS ${CORE_LIB_NAME}
-         RUNTIME DESTINATION bin
-         ARCHIVE DESTINATION lib
-         LIBRARY DESTINATION lib
+         RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
+         ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}
+         LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}
         )
 
 #
 # Headers
 #
-install (FILES ${CORE_HEADERS} DESTINATION ${CMAKE_INSTALL_PREFIX}/include/Unity-${UNITY_API_VERSION}/UnityCore)
+install (FILES ${CORE_HEADERS} DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/Unity-${UNITY_API_VERSION}/UnityCore)
 
 #
 # PkgConfig file
 #
-set (EXEC_PREFIX "${CMAKE_INSTALL_PREFIX}")
-set (LIBDIR "${CMAKE_INSTALL_PREFIX}/lib")
-set (INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
+set (EXEC_PREFIX "${CMAKE_INSTALL_LIBEXECDIR}")
+set (LIBDIR "${CMAKE_INSTALL_LIBDIR}")
+set (INCLUDEDIR "${CMAKE_INSTALL_INCLUDEDIR}")
 
 configure_file (unity-core.pc.cmake ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIB_NAME}.pc @ONLY)
-install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/pkgconfig)
+install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${CORE_LIB_NAME}.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig)

=== modified file 'UnityCore/DBusIndicators.cpp'
--- UnityCore/DBusIndicators.cpp	2015-10-01 17:17:15 +0000
+++ UnityCore/DBusIndicators.cpp	2016-02-09 01:58:26 +0000
@@ -123,7 +123,7 @@
 
     // This is obviously hackish, but this part of the code is mostly hackish...
     // Let's attempt to run it from where we expect it to be
-    std::string cmd = PREFIXDIR + std::string("/lib/unity/unity-panel-service");
+    std::string cmd = UNITYLIBDIR"/" + std::string("unity-panel-service");
     LOG_WARN(logger) << "Couldn't load panel from installed services, "
                      << "so trying to load panel from known location: " << cmd;
 

=== modified file 'config.h.cmake'
--- config.h.cmake	2014-01-16 13:20:16 +0000
+++ config.h.cmake	2016-02-09 01:58:26 +0000
@@ -1,8 +1,9 @@
 #ifndef CONFIG_H
 #define CONFIG_H
 
-#cmakedefine PREFIXDIR "@PREFIXDIR@"
-#cmakedefine DATADIR "@DATADIR@"
+#cmakedefine PREFIXPATH "@PREFIXPATH@"
+#cmakedefine UNITYDATADIR "@UNITYDATADIR@"
+#cmakedefine UNITYLIBDIR "@UNITYLIBDIR@"
 #cmakedefine PKGDATADIR "@PKGDATADIR@"
 #cmakedefine LOCALE_DIR "@LOCALE_DIR@"
 #cmakedefine VERSION "@VERSION@"

=== modified file 'dash/previews/StandaloneApplicationPreview.cpp'
--- dash/previews/StandaloneApplicationPreview.cpp	2014-07-08 16:50:54 +0000
+++ dash/previews/StandaloneApplicationPreview.cpp	2016-02-09 01:58:26 +0000
@@ -17,7 +17,8 @@
  * Authored by: Nick Dedekind <[e-mail]>
  *
  */
-#include <gtk/gtk.h>
+
+#include "config.h"
 
 #include "Nux/Nux.h"
 #include "Nux/VLayout.h"
@@ -165,23 +166,23 @@
     description << "Application description " << i << std::endl;
 
  // creates a generic preview object
-  glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-music.svg", NULL));
-  glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
-  glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-people.svg", NULL));
+  glib::Object<GIcon> iconHint1(g_icon_new_for_string(PKGDATADIR"/lens-nav-music.svg", NULL));
+  glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
+  glib::Object<GIcon> iconHint3(g_icon_new_for_string(PKGDATADIR"/lens-nav-people.svg", NULL));
 
   GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
   g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
 
   glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
 
-  unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
+  unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string(PKGDATADIR "/launcher_bfb.png", NULL));
   unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Proprietary");
   unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "(c) Skype 2012");
   unity_protocol_application_preview_set_last_update(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "11th Apr 2012");
   unity_protocol_application_preview_set_rating(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 0.5);
   unity_protocol_application_preview_set_num_ratings(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 17);
 
-  unity_protocol_preview_set_image_source_uri(proto_obj, "file:///home/nick/Skype.png");
+  unity_protocol_preview_set_image_source_uri(proto_obj, "file://" PKGDATADIR "/launcher_bfb.png");
   unity_protocol_preview_set_title(proto_obj, app_name.str().c_str());
   unity_protocol_preview_set_subtitle(proto_obj, subtitle);
   unity_protocol_preview_set_description(proto_obj, description.str().c_str());
@@ -210,24 +211,24 @@
 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.";
 
  // creates a generic preview object
-  glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-music.svg", NULL));
-  glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
-  glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-people.svg", NULL));
-  glib::Object<GIcon> iconHint4(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-people.svg", NULL));
+  glib::Object<GIcon> iconHint1(g_icon_new_for_string(PKGDATADIR"/lens-nav-music.svg", NULL));
+  glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
+  glib::Object<GIcon> iconHint3(g_icon_new_for_string(PKGDATADIR"/lens-nav-people.svg", NULL));
+  glib::Object<GIcon> iconHint4(g_icon_new_for_string(PKGDATADIR"/lens-nav-people.svg", NULL));
 
   GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
   g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
 
   glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
 
-  unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
+  unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string(PKGDATADIR "/launcher_bfb.png", NULL));
   unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Proprietary");
   unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "(c) Skype 2012");
   unity_protocol_application_preview_set_last_update(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "11th Apr 2012");
   unity_protocol_application_preview_set_rating(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 0.25);
   unity_protocol_application_preview_set_num_ratings(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 5);
 
-  unity_protocol_preview_set_image_source_uri(proto_obj, "file:///home/nick/Skype.png");
+  unity_protocol_preview_set_image_source_uri(proto_obj, "file://" PKGDATADIR "/launcher_bfb.png");
   unity_protocol_preview_set_title(proto_obj, app_name.str().c_str());
   unity_protocol_preview_set_subtitle(proto_obj, subtitle);
   unity_protocol_preview_set_description(proto_obj, description);
@@ -262,9 +263,9 @@
   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.";
 
    // creates a generic preview object
-    glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-music.svg", NULL));
-    glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
-    glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-people.svg", NULL));
+    glib::Object<GIcon> iconHint1(g_icon_new_for_string(PKGDATADIR"/lens-nav-music.svg", NULL));
+    glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
+    glib::Object<GIcon> iconHint3(g_icon_new_for_string(PKGDATADIR"/lens-nav-people.svg", NULL));
 
     GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
   g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
@@ -272,14 +273,14 @@
   glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_application_preview_new()));
 
 
-    unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
+    unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string(PKGDATADIR"/launcher_bfb.png", NULL));
     unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Proprietary");
     unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "(c) Skype 2012");
     unity_protocol_application_preview_set_last_update(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "11th Apr 2012");
     unity_protocol_application_preview_set_rating(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 0.8);
     unity_protocol_application_preview_set_num_ratings(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), 1223);
 
-    unity_protocol_preview_set_image_source_uri(proto_obj, "file:///home/nick/Skype.png");
+    unity_protocol_preview_set_image_source_uri(proto_obj, "file://" PKGDATADIR "/launcher_bfb.png");
     unity_protocol_preview_set_title(proto_obj, app_name.str().c_str());
     unity_protocol_preview_set_subtitle(proto_obj, subtitle);
     unity_protocol_preview_set_description(proto_obj, description);

=== modified file 'dash/previews/StandaloneSocialPreview.cpp'
--- dash/previews/StandaloneSocialPreview.cpp	2014-07-08 16:50:54 +0000
+++ dash/previews/StandaloneSocialPreview.cpp	2016-02-09 01:58:26 +0000
@@ -17,7 +17,7 @@
  * Authored by: Nick Dedekind <[e-mail]>
  *
  */
-#include <gtk/gtk.h>
+#include "config.h"
 
 #include "Nux/Nux.h"
 #include "Nux/VLayout.h"
@@ -159,7 +159,7 @@
   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.";
 
   glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/pixmaps/faces/sunflower.jpg", NULL));
-  glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
+  glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
   glib::Object<GIcon> iconHint3(g_icon_new_for_string("/usr/share/icons/unity-icon-theme/places/svg/service-twitter.svg", NULL));
 
   glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_social_preview_new()));
@@ -193,7 +193,7 @@
 
  // creates a generic preview object
   glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/pixmaps/faces/astronaut.jpg", NULL));
-  glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
+  glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
 
   glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_social_preview_new()));
 
@@ -228,7 +228,7 @@
   const char* description = "Profile pictures are what people want them to think they look like. Tagged pictures are what they really look like.";
 
   glib::Object<GIcon> iconHint1(g_icon_new_for_string("/usr/share/pixmaps/faces/soccerball.png", NULL));
-  glib::Object<GIcon> iconHint2(g_icon_new_for_string("/usr/share/unity/icons/lens-nav-home.svg", NULL));
+  glib::Object<GIcon> iconHint2(g_icon_new_for_string(PKGDATADIR"/lens-nav-home.svg", NULL));
 
   glib::Object<UnityProtocolPreview> proto_obj(UNITY_PROTOCOL_PREVIEW(unity_protocol_social_preview_new()));
 

=== modified file 'data/pam/CMakeLists.txt'
--- data/pam/CMakeLists.txt	2014-06-19 15:54:27 +0000
+++ data/pam/CMakeLists.txt	2016-02-09 01:58:26 +0000
@@ -1,1 +1,1 @@
-install(FILES unity DESTINATION ${CMAKE_SYSCONFDIR}/pam.d)
\ No newline at end of file
+install(FILES unity DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/pam.d)

=== modified file 'debian/libunity-core-6.0-9.install'
--- debian/libunity-core-6.0-9.install	2016-02-08 20:34:08 +0000
+++ debian/libunity-core-6.0-9.install	2016-02-09 01:58:26 +0000
@@ -1,5 +1,5 @@
 usr/lib/*/libunity-core*.so.*
-usr/lib/unity/*.py
+usr/lib/*/unity/*.py
 usr/share/ccsm
 usr/share/gnome-control-center/
 usr/share/unity

=== modified file 'debian/rules'
--- debian/rules	2016-02-08 20:34:08 +0000
+++ debian/rules	2016-02-09 01:58:26 +0000
@@ -23,7 +23,7 @@
 LIBUNITY_PRIVATE := $(shell pkg-config --libs-only-L unity-protocol-private | sed -e 's/-L\(.*\)/\1/' )
 SCOPES_RECOMMENDS := $(shell perl debian/scopes-recommends-generator /usr/share/unity/client-scopes.json)
 
-cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCMAKE_SYSCONFDIR=/etc -DCOMPIZ_PLUGIN_INSTALL_TYPE=package 
+cmake_base_options := -DUSE_GSETTINGS=TRUE -DCOMPIZ_BUILD_WITH_RPATH=FALSE -DCOMPIZ_PACKAGING_ENABLED=TRUE -DCOMPIZ_PLUGIN_INSTALL_TYPE=package
 ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH), $(gles2_architectures)))
   cmake_gl_options := -DBUILD_GLES=TRUE -DDISABLE_MAINTAINER_CFLAGS=ON
 endif
@@ -39,12 +39,7 @@
 	done; \
 	cd $(CURDIR)
 	find debian/tmp/usr/lib -name \*.*a -exec rm {} \;
-	rm -f debian/tmp/usr/share/compiz/networkarearegion.xml
-	rm -f debian/tmp//usr/lib/compiz/libnetworkarearegion.so
-	rm -rf debian/tmp/usr/share/gconf/schemas/
-	mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
-	mv debian/tmp/usr/lib/lib*so* debian/tmp/usr/lib/pkgconfig \
-		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	rm -rf debian/tmp/usr/share/gconf/schemas
 	dh_install --fail-missing
 
 override_dh_gencontrol:

=== modified file 'debian/unity-services.install'
--- debian/unity-services.install	2013-06-17 11:16:12 +0000
+++ debian/unity-services.install	2016-02-09 01:58:26 +0000
@@ -1,3 +1,3 @@
-usr/lib/unity/*service
+usr/lib/*/unity/*service
 usr/share/upstart
 usr/share/man/*/unity-panel-service.1

=== modified file 'debian/unity.install'
--- debian/unity.install	2014-06-19 20:24:13 +0000
+++ debian/unity.install	2016-02-09 01:58:26 +0000
@@ -1,6 +1,6 @@
 etc/pam.d
 usr/bin
-usr/lib/compiz
+usr/lib/*/compiz/libunity*.so
 usr/share/man/*/unity.1
 usr/share/compiz
 usr/share/locale

=== modified file 'gnome/CMakeLists.txt'
--- gnome/CMakeLists.txt	2012-08-17 08:29:45 +0000
+++ gnome/CMakeLists.txt	2016-02-09 01:58:26 +0000
@@ -6,7 +6,7 @@
 		      ${CMAKE_CURRENT_BINARY_DIR}/50-unity-launchers.xml NOTRANSLATIONS)
 
 install (FILES ${CMAKE_CURRENT_BINARY_DIR}/50-unity-launchers.xml
-	 DESTINATION ${CMAKE_INSTALL_PREFIX}/share/gnome-control-center/keybindings)
+	 DESTINATION ${CMAKE_INSTALL_DATADIR}/gnome-control-center/keybindings)
 
 add_custom_target (unity-gnome-keybindings ALL DEPENDS
 		   ${CMAKE_CURRENT_BINARY_DIR}/50-unity-launchers.xml)

=== modified file 'plugins/networkarearegion/CMakeLists.txt'
--- plugins/networkarearegion/CMakeLists.txt	2013-01-08 09:07:52 +0000
+++ plugins/networkarearegion/CMakeLists.txt	2016-02-09 01:58:26 +0000
@@ -8,6 +8,11 @@
   set(revert_compiz TRUE)
 endif()
 
+set (libdir ${CMAKE_INSTALL_LIBDIR})
+set (includedir ${CMAKE_INSTALL_INCLUDEDIR})
+set (libdir ${CMAKE_INSTALL_LIBDIR})
+set (datadir ${CMAKE_INSTALL_FULL_DATADIR})
+
 compiz_plugin (networkarearegion)
 
 if(revert_compiz)

=== modified file 'plugins/unity-mt-grab-handles/CMakeLists.txt'
--- plugins/unity-mt-grab-handles/CMakeLists.txt	2013-01-08 09:07:52 +0000
+++ plugins/unity-mt-grab-handles/CMakeLists.txt	2016-02-09 01:58:26 +0000
@@ -8,6 +8,11 @@
   set(revert_compiz TRUE)
 endif()
 
+set (libdir ${CMAKE_INSTALL_LIBDIR})
+set (includedir ${CMAKE_INSTALL_INCLUDEDIR})
+set (libdir ${CMAKE_INSTALL_LIBDIR})
+set (datadir ${CMAKE_INSTALL_FULL_DATADIR})
+
 compiz_plugin (unitymtgrabhandles PKGDEPS nux-4.0>=4.0.0 PLUGINDEPS composite opengl CFLAGSADD -std=c++0x)
 
 if(revert_compiz)

=== modified file 'plugins/unityshell/CMakeLists.txt'
--- plugins/unityshell/CMakeLists.txt	2015-12-17 15:35:11 +0000
+++ plugins/unityshell/CMakeLists.txt	2016-02-09 01:58:26 +0000
@@ -10,6 +10,11 @@
   set(revert_compiz TRUE)
 endif()
 
+set (libdir ${CMAKE_INSTALL_LIBDIR})
+set (includedir ${CMAKE_INSTALL_INCLUDEDIR})
+set (libdir ${CMAKE_INSTALL_LIBDIR})
+set (datadir ${CMAKE_INSTALL_FULL_DATADIR})
+
 compiz_plugin (unityshell
                PKGDEPS ${UNITY_PLUGIN_DEPS}
                PLUGINDEPS composite opengl compiztoolbox scale
@@ -50,4 +55,4 @@
 #
 # Data
 #
-install (FILES plugin-unityshell.png DESTINATION ${DATADIR}/ccsm/icons/hicolor/64x64/apps)
+install (FILES plugin-unityshell.png DESTINATION ${COMPIZ_DATADIR}/ccsm/icons/hicolor/64x64/apps)

=== modified file 'services/CMakeLists.txt'
--- services/CMakeLists.txt	2014-11-04 19:00:40 +0000
+++ services/CMakeLists.txt	2016-02-09 01:58:26 +0000
@@ -51,10 +51,10 @@
 
 add_executable(unity-panel-service ${PANEL_SOURCES})
 target_link_libraries(unity-panel-service ${LIBS})
-install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_PREFIX}/lib/unity/)
+install(TARGETS unity-panel-service DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity/)
 
 configure_file(unity-panel-service.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)
 
 configure_file(unity-panel-service-lockscreen.conf.in ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf)
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf DESTINATION ${CMAKE_INSTALL_PREFIX}/share/upstart/sessions)
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/unity-panel-service-lockscreen.conf DESTINATION ${CMAKE_INSTALL_DATADIR}/upstart/sessions)

=== modified file 'services/unity-panel-service-lockscreen.conf.in'
--- services/unity-panel-service-lockscreen.conf.in	2014-02-10 16:57:22 +0000
+++ services/unity-panel-service-lockscreen.conf.in	2016-02-09 01:58:26 +0000
@@ -5,4 +5,4 @@
 stop on desktop-unlock
 
 respawn
-exec ${CMAKE_INSTALL_PREFIX}/lib/unity/unity-panel-service --lockscreen-mode
\ No newline at end of file
+exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service --lockscreen-mode

=== modified file 'services/unity-panel-service.conf.in'
--- services/unity-panel-service.conf.in	2014-02-07 15:26:22 +0000
+++ services/unity-panel-service.conf.in	2016-02-09 01:58:26 +0000
@@ -15,4 +15,4 @@
 emits indicator-services-end
 
 respawn
-exec ${CMAKE_INSTALL_PREFIX}/lib/unity/unity-panel-service
+exec ${CMAKE_INSTALL_FULL_LIBDIR}/unity/unity-panel-service

=== modified file 'tests/test_previews_application.cpp'
--- tests/test_previews_application.cpp	2014-03-21 04:40:12 +0000
+++ tests/test_previews_application.cpp	2016-02-09 01:58:26 +0000
@@ -72,7 +72,7 @@
     GHashTable* action_hints1(g_hash_table_new(g_direct_hash, g_direct_equal));
     g_hash_table_insert (action_hints1, g_strdup ("extra-text"), g_variant_new_string("£30.99"));
 
-    unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string("/home/nick/SkypeIcon.png", NULL));
+    unity_protocol_application_preview_set_app_icon(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), g_icon_new_for_string(TESTDATADIR "/bfb.png", NULL));
     unity_protocol_application_preview_set_license(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "License & special char");
     unity_protocol_application_preview_set_copyright(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "Copywrite & special char");
     unity_protocol_application_preview_set_last_update(UNITY_PROTOCOL_APPLICATION_PREVIEW(proto_obj.RawPtr()), "11th Apr 2012");

=== modified file 'tools/CMakeLists.txt'
--- tools/CMakeLists.txt	2012-06-25 07:28:00 +0000
+++ tools/CMakeLists.txt	2016-02-09 01:58:26 +0000
@@ -1,9 +1,8 @@
 #
 # Some unity tools
 #
-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/)
+install(FILES makebootchart.py PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_LIBDIR}/unity)
 
 configure_file (${CMAKE_CURRENT_SOURCE_DIR}/unity.cmake ${CMAKE_BINARY_DIR}/bin/unity)
 install(FILES ${CMAKE_BINARY_DIR}/bin/unity PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ
-GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION bin)
-
+GROUP_EXECUTE WORLD_READ WORLD_EXECUTE DESTINATION ${CMAKE_INSTALL_BINDIR})

=== modified file 'unity-shared/DashStyle.cpp'
--- unity-shared/DashStyle.cpp	2014-08-27 12:55:17 +0000
+++ unity-shared/DashStyle.cpp	2016-02-09 01:58:26 +0000
@@ -46,7 +46,7 @@
 #include "UnitySettings.h"
 #include "config.h"
 
-#define DASH_WIDGETS_FILE DATADIR"/unity/themes/dash-widgets.json"
+#define DASH_WIDGETS_FILE UNITYDATADIR"/themes/dash-widgets.json"
 
 namespace unity
 {