Merge lp:~alan-griffiths/mir/prepare-to-send-clients-input into lp:~robertcarr/mir/prepare-to-send-clients-input

[Alan Griffiths]

Merge trunk and fix compile error

Merge trunk and fix compile error

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-03-12 21:25:44 +0000
+++ CMakeLists.txt	2013-03-13 09:54:21 +0000
@@ -67,7 +67,7 @@
 
 enable_testing()
 
-include_directories(include/)
+include_directories(include/shared)
 
 # Check for boost
 find_package(Boost 1.48.0 COMPONENTS chrono date_time filesystem system thread program_options regex REQUIRED)

=== modified file 'cross-compile-chroot.sh'
--- cross-compile-chroot.sh	2013-03-07 08:04:05 +0000
+++ cross-compile-chroot.sh	2013-03-13 09:54:21 +0000
@@ -37,7 +37,6 @@
     cmake -DCMAKE_TOOLCHAIN_FILE=../cmake/LinuxCrossCompile.cmake \
       -DBoost_COMPILER=-gcc \
       -DMIR_ENABLE_DEATH_TESTS=NO \
-      -DMIR_INPUT_ENABLE_EVEMU=NO \
       -DMIR_PLATFORM=android \
       -DMIR_DISABLE_INPUT=true \
       .. 

=== modified file 'debian/libmirclient-demos.examples'
--- debian/libmirclient-demos.examples	2013-01-28 21:35:03 +0000
+++ debian/libmirclient-demos.examples	2013-03-13 09:54:21 +0000
@@ -2,6 +2,6 @@
 examples/demo_client_accelerated.cpp
 examples/demo_client_unaccelerated.c
 examples/README
-include/mir/draw/graphics.h
-include/mir/draw/mir_image.h
-src/draw/graphics_utils.cpp
+include/shared/mir/draw/graphics.h
+include/shared/mir/draw/mir_image.h
+src/shared/draw/graphics_utils.cpp

=== modified file 'debian/rules'
--- debian/rules	2013-03-12 03:50:42 +0000
+++ debian/rules	2013-03-13 09:54:21 +0000
@@ -27,7 +27,6 @@
 	  $(COMMON_CONFIGURE_OPTIONS) \
 	  -DBoost_COMPILER=-gcc \
 	  -DMIR_ENABLE_DEATH_TESTS=NO \
-	  -DMIR_INPUT_ENABLE_EVEMU=NO \
 	  -DMIR_PLATFORM=android
 else
 	dh_auto_configure -- \

=== modified file 'examples/CMakeLists.txt'
--- examples/CMakeLists.txt	2013-03-08 09:39:52 +0000
+++ examples/CMakeLists.txt	2013-03-13 09:54:21 +0000
@@ -82,7 +82,11 @@
 
 )
 
-include_directories(${GLESv2_INCLUDE_DIRS})
+include_directories(
+  ${PROJECT_SOURCE_DIR}/include/server
+  ${PROJECT_SOURCE_DIR}/include/client
+  ${GLESv2_INCLUDE_DIRS}
+)
 
 set(RENDER_TO_FB_SOURCES render_to_fb.cpp)
 add_executable(render_to_fb ${RENDER_TO_FB_SOURCES})

=== added directory 'include/client'
=== renamed directory 'include/mir_toolkit' => 'include/client/mir_toolkit'
=== added directory 'include/server'
=== renamed directory 'include/mir' => 'include/server/mir'
=== added directory 'include/shared'
=== added directory 'include/shared/mir'
=== renamed directory 'include/mir/draw' => 'include/shared/mir/draw'
=== renamed directory 'include/mir/geometry' => 'include/shared/mir/geometry'
=== renamed directory 'include/mir/protobuf' => 'include/shared/mir/protobuf'
=== added directory 'include/shared/mir_toolkit'
=== renamed directory 'include/mir_toolkit/input' => 'include/shared/mir_toolkit/input'
=== added directory 'include/test'
=== renamed directory 'include/mir_test' => 'include/test/mir_test'
=== modified file 'include/test/mir_test/fake_event_hub_input_configuration.h'
--- include/mir_test/fake_event_hub_input_configuration.h	2013-03-06 17:01:51 +0000
+++ include/test/mir_test/fake_event_hub_input_configuration.h	2013-03-13 09:54:21 +0000
@@ -19,7 +19,7 @@
 #ifndef MIR_TEST_DOUBLES_FAKE_EVENT_HUB_INPUT_CONFIGURATION_H_
 #define MIR_TEST_DOUBLES_FAKE_EVENT_HUB_INPUT_CONFIGURATION_H_
 
-#include "src/input/android/default_android_input_configuration.h"
+#include "src/server/input/android/default_android_input_configuration.h"
 
 #include <utils/StrongPointer.h>
 

=== renamed directory 'include/mir_test_cucumber' => 'include/test/mir_test_cucumber'
=== renamed directory 'include/mir_test_doubles' => 'include/test/mir_test_doubles'
=== modified file 'include/test/mir_test_doubles/mock_alloc_adaptor.h'
--- include/mir_test_doubles/mock_alloc_adaptor.h	2013-03-07 08:04:05 +0000
+++ include/test/mir_test_doubles/mock_alloc_adaptor.h	2013-03-13 09:54:21 +0000
@@ -19,8 +19,8 @@
 #ifndef MIR_TEST_DOUBLES_MOCK_ALLOC_ADAPTOR_H_
 #define MIR_TEST_DOUBLES_MOCK_ALLOC_ADAPTOR_H_
 
-#include "src/graphics/android/graphic_alloc_adaptor.h"
-#include "src/graphics/android/android_buffer.h"
+#include "src/server/graphics/android/graphic_alloc_adaptor.h"
+#include "src/server/graphics/android/android_buffer.h"
 
 #include <system/window.h>
 #include <gmock/gmock.h>

=== renamed directory 'include/mir_test_framework' => 'include/test/mir_test_framework'
=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2013-03-07 08:04:05 +0000
+++ src/CMakeLists.txt	2013-03-13 09:54:21 +0000
@@ -1,96 +1,9 @@
 set(MIR_GENERATED_INCLUDE_DIRECTORIES)
-add_subdirectory(protobuf/)
+add_subdirectory(shared/)
 include_directories(${MIR_GENERATED_INCLUDE_DIRECTORIES})
 
-add_subdirectory(compositor/)
-add_subdirectory(draw/)
-add_subdirectory(graphics/)
-add_subdirectory(input/)
-add_subdirectory(logging/)
-add_subdirectory(surfaces/)
-add_subdirectory(options/)
+add_subdirectory(server/)
 add_subdirectory(client/)
-add_subdirectory(frontend/)
-add_subdirectory(shell/)
-
-configure_file(
-  ${CMAKE_CURRENT_SOURCE_DIR}/mirserver.pc.in
-  ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
-)
-
-set(
-  SRCS
-  display_server.cpp
-  default_server_configuration.cpp
-)
-
-set(MIRSERVER_LINKAGE SHARED)
-
-add_library(mirserver ${MIRSERVER_LINKAGE}
-  ${SRCS}
-)
-
-add_executable(
-  mirds
-
-  main.cpp
-)
-
-set_target_properties(mirds PROPERTIES OUTPUT_NAME mir)
-
-list(APPEND MIRSERVER_ARCHIVES
-  miroptions
-  mircompositor
-  mirfrontend
-  mirgraphics
-  mirinput
-  mirsurfaces
-)
-
-list(APPEND MIRSERVER_LINKS
-  mirplatformgraphics
-  mirprotobuf
-  3rd_party
-  ${Boost_LIBRARIES}
-)
-
-if(${MIRSERVER_LINKAGE} STREQUAL SHARED)
-  target_link_libraries(mirserver
-    LINK_PRIVATE
-      -Wl,-whole-archive
-      ${MIRSERVER_ARCHIVES}
-      -Wl,-no-whole-archive
-    LINK_PUBLIC
-      ${MIRSERVER_LINKS}
-  )
-  install(TARGETS mirserver
-    LIBRARY DESTINATION lib
-  )
-else()
-  target_link_libraries(mirserver
-    LINK_PUBLIC
-      ${MIRSERVER_ARCHIVES}
-      ${MIRSERVER_LINKS}
-  )
-endif()
-
-set_target_properties(mirserver PROPERTIES
-  VERSION ${MIR_VERSION_MAJOR}.${MIR_VERSION_MINOR}.${MIR_VERSION_PATCH}
-  SOVERSION ${MIR_VERSION_MAJOR}
-)
-
-target_link_libraries(mirds
-  mirserver
-  ${Boost_LIBRARIES}
-)
-
-install(TARGETS mirds
-  RUNTIME DESTINATION bin
-)
-
-install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
-  DESTINATION lib/pkgconfig
-)
 
 set(
   MIR_GENERATED_INCLUDE_DIRECTORIES

=== modified file 'src/client/CMakeLists.txt'
--- src/client/CMakeLists.txt	2013-03-12 16:43:03 +0000
+++ src/client/CMakeLists.txt	2013-03-13 09:54:21 +0000
@@ -20,7 +20,7 @@
 endif()
 
 include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
+  ${PROJECT_SOURCE_DIR}/include/client
   ${DRM_INCLUDE_DIRS}
 )
 
@@ -107,9 +107,9 @@
 set(
   CLIENT_PUBLIC_HEADERS
 
-  ${CMAKE_SOURCE_DIR}/include/mir_toolkit/mir_client_library.h
-  ${CMAKE_SOURCE_DIR}/include/mir_toolkit/mir_client_library_lightdm.h
-  ${CMAKE_SOURCE_DIR}/include/mir_toolkit/mir_client_library_drm.h
+  ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_client_library.h
+  ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_client_library_lightdm.h
+  ${CMAKE_SOURCE_DIR}/include/client/mir_toolkit/mir_client_library_drm.h
 )
 
 set_target_properties(

=== added directory 'src/server'
=== added file 'src/server/CMakeLists.txt'
--- src/server/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/server/CMakeLists.txt	2013-03-13 09:54:21 +0000
@@ -0,0 +1,89 @@
+include_directories(${PROJECT_SOURCE_DIR}/include/server)
+
+add_subdirectory(compositor/)
+add_subdirectory(graphics/)
+add_subdirectory(input/)
+add_subdirectory(logging/)
+add_subdirectory(surfaces/)
+add_subdirectory(options/)
+add_subdirectory(frontend/)
+add_subdirectory(shell/)
+
+configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/mirserver.pc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
+)
+
+set(
+  SRCS
+  display_server.cpp
+  default_server_configuration.cpp
+)
+
+set(MIRSERVER_LINKAGE SHARED)
+
+add_library(mirserver ${MIRSERVER_LINKAGE}
+  ${SRCS}
+)
+
+add_executable(
+  mirds
+
+  main.cpp
+)
+
+set_target_properties(mirds PROPERTIES OUTPUT_NAME mir)
+
+list(APPEND MIRSERVER_ARCHIVES
+  miroptions
+  mircompositor
+  mirfrontend
+  mirgraphics
+  mirinput
+  mirsurfaces
+)
+
+list(APPEND MIRSERVER_LINKS
+  mirplatformgraphics
+  mirprotobuf
+  3rd_party
+  ${Boost_LIBRARIES}
+)
+
+if(${MIRSERVER_LINKAGE} STREQUAL SHARED)
+  target_link_libraries(mirserver
+    LINK_PRIVATE
+      -Wl,-whole-archive
+      ${MIRSERVER_ARCHIVES}
+      -Wl,-no-whole-archive
+    LINK_PUBLIC
+      ${MIRSERVER_LINKS}
+  )
+  install(TARGETS mirserver
+    LIBRARY DESTINATION lib
+  )
+else()
+  target_link_libraries(mirserver
+    LINK_PUBLIC
+      ${MIRSERVER_ARCHIVES}
+      ${MIRSERVER_LINKS}
+  )
+endif()
+
+set_target_properties(mirserver PROPERTIES
+  VERSION ${MIR_VERSION_MAJOR}.${MIR_VERSION_MINOR}.${MIR_VERSION_PATCH}
+  SOVERSION ${MIR_VERSION_MAJOR}
+)
+
+target_link_libraries(mirds
+  mirserver
+  ${Boost_LIBRARIES}
+)
+
+install(TARGETS mirds
+  RUNTIME DESTINATION bin
+)
+
+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/mirserver.pc
+  DESTINATION lib/pkgconfig
+)

=== renamed directory 'src/compositor' => 'src/server/compositor'
=== renamed file 'src/default_server_configuration.cpp' => 'src/server/default_server_configuration.cpp'
=== renamed file 'src/display_server.cpp' => 'src/server/display_server.cpp'
=== renamed directory 'src/frontend' => 'src/server/frontend'
=== renamed directory 'src/graphics' => 'src/server/graphics'
=== renamed directory 'src/input' => 'src/server/input'
=== renamed directory 'src/logging' => 'src/server/logging'
=== renamed file 'src/main.cpp' => 'src/server/main.cpp'
=== renamed file 'src/mirserver.pc.in' => 'src/server/mirserver.pc.in'
=== renamed directory 'src/options' => 'src/server/options'
=== renamed directory 'src/shell' => 'src/server/shell'
=== renamed directory 'src/surfaces' => 'src/server/surfaces'
=== added directory 'src/shared'
=== added file 'src/shared/CMakeLists.txt'
--- src/shared/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/shared/CMakeLists.txt	2013-03-13 09:54:21 +0000
@@ -0,0 +1,8 @@
+set(MIR_GENERATED_INCLUDE_DIRECTORIES)
+add_subdirectory(protobuf/)
+add_subdirectory(draw/)
+
+set(
+  MIR_GENERATED_INCLUDE_DIRECTORIES
+  ${MIR_GENERATED_INCLUDE_DIRECTORIES}
+  PARENT_SCOPE)

=== renamed directory 'src/draw' => 'src/shared/draw'
=== renamed directory 'src/protobuf' => 'src/shared/protobuf'
=== modified file 'tests/CMakeLists.txt'
--- tests/CMakeLists.txt	2013-03-08 07:20:43 +0000
+++ tests/CMakeLists.txt	2013-03-13 09:54:21 +0000
@@ -20,6 +20,10 @@
   add_definitions(-DMIR_DEATH_TESTS_ENABLED)
 endif(MIR_ENABLE_DEATH_TESTS)
 
+include_directories(${PROJECT_SOURCE_DIR}/include/server)
+include_directories(${PROJECT_SOURCE_DIR}/include/client)
+include_directories(${PROJECT_SOURCE_DIR}/include/test)
+
 if (MIR_PLATFORM STREQUAL "android")
   include_directories( ${LIBHARDWARE_INCLUDE_DIRS} ${ANDROID_UI_INCLUDE_DIRS})
 endif()

=== modified file 'tests/behavior-tests/session_management_context.cpp'
--- tests/behavior-tests/session_management_context.cpp	2013-03-12 21:25:44 +0000
+++ tests/behavior-tests/session_management_context.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "session_management_context.h"
+#include "mir_test_cucumber/session_management_context.h"
 
 #include "mir/shell/surface.h"
 #include "mir/shell/surface_creation_parameters.h"

=== modified file 'tests/behavior-tests/session_manager_steps.cpp'
--- tests/behavior-tests/session_manager_steps.cpp	2013-01-24 19:16:18 +0000
+++ tests/behavior-tests/session_manager_steps.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "session_management_context.h"
+#include "mir_test_cucumber/session_management_context.h"
 
 #include <gtest/gtest.h>
 #include <cucumber-cpp/defs.hpp>

=== modified file 'tests/integration-tests/CMakeLists.txt'
--- tests/integration-tests/CMakeLists.txt	2013-03-08 07:20:43 +0000
+++ tests/integration-tests/CMakeLists.txt	2013-03-13 09:54:21 +0000
@@ -1,5 +1,4 @@
 include_directories(${CMAKE_SOURCE_DIR})
-include_directories(${PROJECT_SOURCE_DIR}/include/mir_test_cucumber)
 
 set(
   INTEGRATION_TESTS_SRCS

=== modified file 'tests/integration-tests/client/test_client_render.cpp'
--- tests/integration-tests/client/test_client_render.cpp	2013-03-07 08:04:05 +0000
+++ tests/integration-tests/client/test_client_render.cpp	2013-03-13 09:54:21 +0000
@@ -21,10 +21,10 @@
 #include "mir_toolkit/mir_client_library.h"
 
 #include "mir/compositor/buffer_ipc_package.h"
-#include "src/frontend/protobuf_socket_communicator.h"
+#include "src/server/frontend/protobuf_socket_communicator.h"
 #include "mir/frontend/resource_cache.h"
-#include "src/graphics/android/android_buffer.h"
-#include "src/graphics/android/android_alloc_adaptor.h"
+#include "src/server/graphics/android/android_buffer.h"
+#include "src/server/graphics/android/android_alloc_adaptor.h"
 
 #include "mir_test/draw/android_graphics.h"
 #include "mir_test/draw/patterns.h"

=== modified file 'tests/integration-tests/cucumber/test_session_management_context.cpp'
--- tests/integration-tests/cucumber/test_session_management_context.cpp	2013-03-12 21:25:44 +0000
+++ tests/integration-tests/cucumber/test_session_management_context.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "session_management_context.h"
+#include "mir_test_cucumber/session_management_context.h"
 #include "mir/server_configuration.h"
 #include "mir/shell/session_store.h"
 #include "mir/shell/session.h"

=== modified file 'tests/integration-tests/graphics/android/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/android/test_buffer_integration.cpp	2013-03-07 08:04:05 +0000
+++ tests/integration-tests/graphics/android/test_buffer_integration.cpp	2013-03-13 09:54:21 +0000
@@ -16,9 +16,9 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "src/graphics/android/android_platform.h"
-#include "src/graphics/android/android_buffer_allocator.h"
-#include "src/graphics/android/android_display.h"
+#include "src/server/graphics/android/android_platform.h"
+#include "src/server/graphics/android/android_buffer_allocator.h"
+#include "src/server/graphics/android/android_display.h"
 #include "mir/graphics/buffer_initializer.h"
 #include "mir/graphics/null_display_report.h"
 #include "mir/compositor/swapper_factory.h"

=== modified file 'tests/integration-tests/graphics/gbm/test_buffer_integration.cpp'
--- tests/integration-tests/graphics/gbm/test_buffer_integration.cpp	2013-03-07 08:04:05 +0000
+++ tests/integration-tests/graphics/gbm/test_buffer_integration.cpp	2013-03-13 09:54:21 +0000
@@ -16,9 +16,9 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/graphics/gbm/gbm_platform.h"
-#include "src/graphics/gbm/gbm_display.h"
-#include "src/graphics/gbm/gbm_buffer_allocator.h"
+#include "src/server/graphics/gbm/gbm_platform.h"
+#include "src/server/graphics/gbm/gbm_display.h"
+#include "src/server/graphics/gbm/gbm_buffer_allocator.h"
 #include "mir/compositor/buffer_basic.h"
 #include "mir/compositor/buffer_id.h"
 #include "mir/compositor/buffer_properties.h"

=== modified file 'tests/integration-tests/input/android/test_android_cursor_listener.cpp'
--- tests/integration-tests/input/android/test_android_cursor_listener.cpp	2013-03-08 07:20:43 +0000
+++ tests/integration-tests/input/android/test_android_cursor_listener.cpp	2013-03-13 09:54:21 +0000
@@ -18,8 +18,8 @@
  */
 
 #include "mir/input/event_filter.h"
-#include "src/input/android/android_input_manager.h"
-#include "src/input/android/default_android_input_configuration.h"
+#include "src/server/input/android/android_input_manager.h"
+#include "src/server/input/android/default_android_input_configuration.h"
 #include "mir/input/cursor_listener.h"
 
 #include "mir_test/fake_shared.h"

=== modified file 'tests/integration-tests/input/android/test_android_input_manager.cpp'
--- tests/integration-tests/input/android/test_android_input_manager.cpp	2013-03-12 21:25:44 +0000
+++ tests/integration-tests/input/android/test_android_input_manager.cpp	2013-03-13 09:54:21 +0000
@@ -18,8 +18,8 @@
  */
 
 #include "mir/input/event_filter.h"
-#include "src/input/android/default_android_input_configuration.h"
-#include "src/input/android/android_input_manager.h"
+#include "src/server/input/android/default_android_input_configuration.h"
+#include "src/server/input/android/android_input_manager.h"
 
 #include "mir_test/fake_shared.h"
 #include "mir_test/fake_event_hub.h"

=== modified file 'tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp'
--- tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp	2013-02-05 18:12:46 +0000
+++ tests/integration-tests/input/android/test_fake_event_hub_to_event_filter.cpp	2013-03-13 09:54:21 +0000
@@ -17,9 +17,9 @@
  *              Daniel d'Andrada <[e-mail]>
  */
 #include "mir/input/event_filter.h"
-#include "src/input/android/event_filter_dispatcher_policy.h"
-#include "src/input/android/rudimentary_input_reader_policy.h"
-#include "src/input/android/android_input_constants.h"
+#include "src/server/input/android/event_filter_dispatcher_policy.h"
+#include "src/server/input/android/rudimentary_input_reader_policy.h"
+#include "src/server/input/android/android_input_constants.h"
 
 #include "mir_test/fake_shared.h"
 #include "mir_test/fake_event_hub.h"

=== modified file 'tests/mir_test_doubles/test_protobuf_socket_server.cpp'
--- tests/mir_test_doubles/test_protobuf_socket_server.cpp	2013-01-02 15:51:50 +0000
+++ tests/mir_test_doubles/test_protobuf_socket_server.cpp	2013-03-13 09:54:21 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "mir_test/test_protobuf_server.h"
-#include "src/frontend/protobuf_socket_communicator.h"
+#include "src/server/frontend/protobuf_socket_communicator.h"
 
 namespace mt = mir::test;
 namespace mtd = mir::test::doubles;

=== modified file 'tests/unit-tests/CMakeLists.txt'
--- tests/unit-tests/CMakeLists.txt	2013-03-12 03:50:42 +0000
+++ tests/unit-tests/CMakeLists.txt	2013-03-13 09:54:21 +0000
@@ -42,7 +42,6 @@
   ${GMOCK_LIBRARY}
   ${GMOCK_MAIN_LIBRARY}
   ${Boost_LIBRARIES}
-  ${EVEMU_LIBRARIES}
   ${CMAKE_THREAD_LIBS_INIT} # Link in pthread.
 
   ${ANDROID_STDLIB}

=== modified file 'tests/unit-tests/compositor/test_temporary_buffers.cpp'
--- tests/unit-tests/compositor/test_temporary_buffers.cpp	2013-01-30 18:34:43 +0000
+++ tests/unit-tests/compositor/test_temporary_buffers.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "src/compositor/temporary_buffers.h"
+#include "src/server/compositor/temporary_buffers.h"
 #include "mir_test_doubles/mock_buffer.h"
 #include "mir_test_doubles/stub_buffer.h"
 #include "mir_test_doubles/mock_swapper.h"

=== modified file 'tests/unit-tests/frontend/test_application_mediator.cpp'
--- tests/unit-tests/frontend/test_application_mediator.cpp	2013-03-12 21:25:44 +0000
+++ tests/unit-tests/frontend/test_application_mediator.cpp	2013-03-13 09:54:21 +0000
@@ -34,7 +34,7 @@
 #include "mir_test_doubles/stub_session.h"
 #include "mir_test/fake_shared.h"
 
-#include "src/surfaces/proxy_surface.h"
+#include "src/server/surfaces/proxy_surface.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>

=== modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp'
--- tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/graphics/android/test_android_alloc_adaptor.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "src/graphics/android/android_alloc_adaptor.h"
+#include "src/server/graphics/android/android_alloc_adaptor.h"
 
 #include "mir_test_doubles/mock_android_alloc_device.h"
 #include "mir_test_doubles/mock_alloc_adaptor.h"

=== modified file 'tests/unit-tests/graphics/android/test_android_alloc_adaptor_native_win.cpp'
--- tests/unit-tests/graphics/android/test_android_alloc_adaptor_native_win.cpp	2013-01-10 16:40:10 +0000
+++ tests/unit-tests/graphics/android/test_android_alloc_adaptor_native_win.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "src/graphics/android/android_buffer_handle_default.h"
+#include "src/server/graphics/android/android_buffer_handle_default.h"
 #include "mir/compositor/buffer_ipc_package.h"
 #include "mir_test_doubles/mock_alloc_adaptor.h"
 #include "mir_test_doubles/mock_android_alloc_device.h"

=== modified file 'tests/unit-tests/graphics/android/test_android_buffer.cpp'
--- tests/unit-tests/graphics/android/test_android_buffer.cpp	2012-12-19 16:01:00 +0000
+++ tests/unit-tests/graphics/android/test_android_buffer.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "src/graphics/android/android_buffer.h"
+#include "src/server/graphics/android/android_buffer.h"
 #include "mir/compositor/buffer_ipc_package.h"
 #include "mir_test_doubles/mock_alloc_adaptor.h"
 

=== modified file 'tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp'
--- tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2012-12-19 16:01:00 +0000
+++ tests/unit-tests/graphics/android/test_android_buffer_allocator.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/graphics/android/android_buffer_allocator.h"
+#include "src/server/graphics/android/android_buffer_allocator.h"
 
 #include <gtest/gtest.h>
 

=== modified file 'tests/unit-tests/graphics/android/test_android_fb.cpp'
--- tests/unit-tests/graphics/android/test_android_fb.cpp	2013-01-21 16:02:54 +0000
+++ tests/unit-tests/graphics/android/test_android_fb.cpp	2013-03-13 09:54:21 +0000
@@ -16,8 +16,8 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "src/graphics/android/android_display.h"
-#include "src/graphics/android/android_framebuffer_window_query.h"
+#include "src/server/graphics/android/android_display.h"
+#include "src/server/graphics/android/android_framebuffer_window_query.h"
 #include "mir_test/egl_mock.h"
 
 #include <gtest/gtest.h>

=== modified file 'tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp'
--- tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp	2012-10-30 12:28:28 +0000
+++ tests/unit-tests/graphics/android/test_android_framebuffer_window.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Kevin DuBois <[e-mail]>
  */
 
-#include "src/graphics/android/android_framebuffer_window.h"
+#include "src/server/graphics/android/android_framebuffer_window.h"
 
 #include "mir_test/egl_mock.h"
 

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_buffer.cpp	2013-03-13 09:54:21 +0000
@@ -21,9 +21,9 @@
 #include "mock_drm.h"
 #include "mock_gbm.h"
 
-#include "src/graphics/gbm/gbm_platform.h"
-#include "src/graphics/gbm/gbm_buffer.h"
-#include "src/graphics/gbm/gbm_buffer_allocator.h"
+#include "src/server/graphics/gbm/gbm_platform.h"
+#include "src/server/graphics/gbm/gbm_buffer.h"
+#include "src/server/graphics/gbm/gbm_buffer_allocator.h"
 #include "mir/graphics/buffer_initializer.h"
 #include "mir/compositor/buffer_ipc_package.h"
 #include "mir/compositor/buffer_properties.h"

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_buffer_allocator.cpp	2013-03-13 09:54:21 +0000
@@ -17,9 +17,9 @@
  * Authored by: Christopher James Halse Rogers <[e-mail]>
  */
 
-#include "src/graphics/gbm/gbm_platform.h"
+#include "src/server/graphics/gbm/gbm_platform.h"
 #include "mir/compositor/graphic_buffer_allocator.h"
-#include "src/graphics/gbm/gbm_buffer_allocator.h"
+#include "src/server/graphics/gbm/gbm_buffer_allocator.h"
 #include "mir/compositor/buffer_properties.h"
 
 #include "mock_drm.h"

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_display.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_display.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_display.cpp	2013-03-13 09:54:21 +0000
@@ -16,8 +16,8 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 #include <boost/throw_exception.hpp>
-#include "src/graphics/gbm/gbm_platform.h"
-#include "src/graphics/gbm/gbm_display.h"
+#include "src/server/graphics/gbm/gbm_platform.h"
+#include "src/server/graphics/gbm/gbm_display.h"
 #include "mir/logging/display_report.h"
 #include "mir/logging/logger.h"
 

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_display_configuration.cpp	2013-03-13 09:54:21 +0000
@@ -19,8 +19,8 @@
 #include <boost/throw_exception.hpp>
 #include "mir/graphics/display_configuration.h"
 #include "mir/graphics/display.h"
-#include "src/graphics/gbm/gbm_platform.h"
-#include "src/graphics/gbm/kms_display_configuration.h"
+#include "src/server/graphics/gbm/gbm_platform.h"
+#include "src/server/graphics/gbm/kms_display_configuration.h"
 
 #include "mir_test/egl_mock.h"
 #include "mir_test/gl_mock.h"

=== modified file 'tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp'
--- tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/graphics/gbm/test_gbm_display_multi_monitor.cpp	2013-03-13 09:54:21 +0000
@@ -18,7 +18,7 @@
 
 #include "mir/graphics/display.h"
 #include "mir/graphics/display_buffer.h"
-#include "src/graphics/gbm/gbm_platform.h"
+#include "src/server/graphics/gbm/gbm_platform.h"
 
 #include "mir_test/egl_mock.h"
 #include "mir_test/gl_mock.h"

=== modified file 'tests/unit-tests/graphics/gbm/test_kms_output.cpp'
--- tests/unit-tests/graphics/gbm/test_kms_output.cpp	2013-02-08 17:56:11 +0000
+++ tests/unit-tests/graphics/gbm/test_kms_output.cpp	2013-03-13 09:54:21 +0000
@@ -16,8 +16,8 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/graphics/gbm/kms_output.h"
-#include "src/graphics/gbm/page_flipper.h"
+#include "src/server/graphics/gbm/kms_output.h"
+#include "src/server/graphics/gbm/page_flipper.h"
 
 #include "mir_test/fake_shared.h"
 

=== modified file 'tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp'
--- tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/graphics/gbm/test_kms_page_flipper.cpp	2013-03-13 09:54:21 +0000
@@ -16,12 +16,12 @@
  * Authored by: Alexandros Frantzis <[e-mail]>
  */
 
-#include "src/graphics/gbm/kms_page_flipper.h"
+#include "src/server/graphics/gbm/kms_page_flipper.h"
 
 #include "mock_drm.h"
-#include "include/mir_test_doubles/mock_display_report.h"
-#include "include/mir/graphics/null_display_report.h"
-#include "include/mir_test/fake_shared.h"
+#include "mir_test_doubles/mock_display_report.h"
+#include "mir/graphics/null_display_report.h"
+#include "mir_test/fake_shared.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>

=== modified file 'tests/unit-tests/input/android/test_android_communication_package.cpp'
--- tests/unit-tests/input/android/test_android_communication_package.cpp	2013-03-11 19:23:19 +0000
+++ tests/unit-tests/input/android/test_android_communication_package.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "src/input/android/android_input_channel.h"
+#include "src/server/input/android/android_input_channel.h"
 
 #include <gtest/gtest.h>
 #include <gmock/gmock.h>

=== modified file 'tests/unit-tests/input/android/test_android_input_lexicon.cpp'
--- tests/unit-tests/input/android/test_android_input_lexicon.cpp	2013-03-07 08:04:05 +0000
+++ tests/unit-tests/input/android/test_android_input_lexicon.cpp	2013-03-13 09:54:21 +0000
@@ -15,7 +15,7 @@
  *
  * Authored by: Robert Carr <[e-mail]>
  */
-#include "src/input/android/android_input_lexicon.h"
+#include "src/server/input/android/android_input_lexicon.h"
 // Is this the right place for this header? Will eventually be included by clients.
 #include "mir_toolkit/input/event.h"
 

=== modified file 'tests/unit-tests/input/android/test_android_input_manager.cpp'
--- tests/unit-tests/input/android/test_android_input_manager.cpp	2013-03-11 19:26:34 +0000
+++ tests/unit-tests/input/android/test_android_input_manager.cpp	2013-03-13 09:54:21 +0000
@@ -16,10 +16,10 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "src/input/android/android_input_manager.h"
-#include "src/input/android/android_input_configuration.h"
-#include "src/input/android/android_input_thread.h"
-#include "src/input/android/android_input_constants.h"
+#include "src/server/input/android/android_input_manager.h"
+#include "src/server/input/android/android_input_configuration.h"
+#include "src/server/input/android/android_input_thread.h"
+#include "src/server/input/android/android_input_constants.h"
 
 #include "mir/input/input_channel.h"
 

=== modified file 'tests/unit-tests/input/android/test_android_input_reader_policy.cpp'
--- tests/unit-tests/input/android/test_android_input_reader_policy.cpp	2013-01-18 10:01:05 +0000
+++ tests/unit-tests/input/android/test_android_input_reader_policy.cpp	2013-03-13 09:54:21 +0000
@@ -19,7 +19,7 @@
 #include "mir_test_doubles/mock_viewable_area.h"
 #include "mir_test/fake_shared.h"
 
-#include "src/input/android/android_input_reader_policy.h"
+#include "src/server/input/android/android_input_reader_policy.h"
 #include "mir/geometry/rectangle.h"
 
 #include <gtest/gtest.h>

=== modified file 'tests/unit-tests/input/android/test_android_pointer_controller.cpp'
--- tests/unit-tests/input/android/test_android_pointer_controller.cpp	2013-01-18 10:01:05 +0000
+++ tests/unit-tests/input/android/test_android_pointer_controller.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "src/input/android/android_pointer_controller.h"
+#include "src/server/input/android/android_pointer_controller.h"
 
 #include "mir_test_doubles/mock_viewable_area.h"
 #include "mir_test/event_factory.h"

=== modified file 'tests/unit-tests/input/android/test_event_filter_chain.cpp'
--- tests/unit-tests/input/android/test_event_filter_chain.cpp	2013-01-18 10:09:43 +0000
+++ tests/unit-tests/input/android/test_event_filter_chain.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Robert Carr <[e-mail]>
  */
 
-#include "src/input/event_filter_chain.h"
+#include "src/server/input/event_filter_chain.h"
 #include "mir_test_doubles/mock_event_filter.h"
 
 #include <androidfw/Input.h>

=== modified file 'tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp'
--- tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp	2013-01-18 10:01:05 +0000
+++ tests/unit-tests/input/android/test_event_filter_input_dispatcher_policy.cpp	2013-03-13 09:54:21 +0000
@@ -17,7 +17,7 @@
  */
 
 #include "mir/input/event_filter.h"
-#include "src/input/android/event_filter_dispatcher_policy.h"
+#include "src/server/input/android/event_filter_dispatcher_policy.h"
 
 #include "mir_test/fake_shared.h"
 #include "mir_test_doubles/mock_event_filter.h"

=== modified file 'tests/unit-tests/shell/test_application_session.cpp'
--- tests/unit-tests/shell/test_application_session.cpp	2013-03-12 21:25:44 +0000
+++ tests/unit-tests/shell/test_application_session.cpp	2013-03-13 09:54:21 +0000
@@ -23,7 +23,7 @@
 #include "mir_test_doubles/mock_surface_factory.h"
 #include "mir_test_doubles/mock_surface.h"
 
-#include "src/surfaces/proxy_surface.h"
+#include "src/server/surfaces/proxy_surface.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

=== modified file 'tests/unit-tests/shell/test_session_manager.cpp'
--- tests/unit-tests/shell/test_session_manager.cpp	2013-03-12 21:25:44 +0000
+++ tests/unit-tests/shell/test_session_manager.cpp	2013-03-13 09:54:21 +0000
@@ -29,7 +29,7 @@
 #include "mir_test_doubles/mock_surface_factory.h"
 #include "mir_test_doubles/null_buffer_bundle.h"
 
-#include "src/surfaces/proxy_surface.h"
+#include "src/server/surfaces/proxy_surface.h"
 
 #include <gmock/gmock.h>
 #include <gtest/gtest.h>

=== modified file 'tests/unit-tests/surfaces/test_proxy_surface.cpp'
--- tests/unit-tests/surfaces/test_proxy_surface.cpp	2013-03-12 21:25:44 +0000
+++ tests/unit-tests/surfaces/test_proxy_surface.cpp	2013-03-13 09:54:21 +0000
@@ -16,7 +16,7 @@
  * Authored by: Alan Griffiths <[e-mail]>
  */
 
-#include "src/surfaces/proxy_surface.h"
+#include "src/server/surfaces/proxy_surface.h"
 #include "mir/surfaces/surface.h"
 #include "mir/shell/surface_creation_parameters.h"
 #include "mir/surfaces/surface_stack_model.h"