Merge lp:~thomas-voss/platform-api/fix-1202309 into lp:platform-api

[Thomas Voß]

Remove versioned include directories.

Remove versioned include directories.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:94
http://jenkins.qa.ubuntu.com/job/platform-api-ci/86/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-amd64-ci/56
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/56
        deb: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-armhf-ci/56/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/platform-api-saucy-i386-ci/56

Click here to trigger a rebuild:
http://s-jenkins:8080/job/platform-api-ci/86/rebuild

review: Approve (continuous-integration)

[Dimitri John Ledkov (xnox)]

yes, this is correct for now.

review: Approve

[Łukasz Zemczak (sil2100)]

I guess this makes sense right now. +1

review: Approve

=== modified file 'data/ubuntu-platform-api.pc.in'
--- data/ubuntu-platform-api.pc.in	2013-06-11 11:05:25 +0000
+++ data/ubuntu-platform-api.pc.in	2013-07-18 10:12:43 +0000
@@ -6,4 +6,4 @@
 Name: @CMAKE_PROJECT_NAME@
 Description: Ubuntu's platform abstraction layer.
 Version: @UBUNTU_PLATFORM_API_VERSION_MAJOR@.@UBUNTU_PLATFORM_API_VERSION_MINOR@.@UBUNTU_PLATFORM_API_VERSION_PATCH@
-Cflags: -I${includedir}/ubuntu-@UBUNTU_PLATFORM_API_VERSION_MAJOR@
+Cflags: -I${includedir}/ubuntu

=== modified file 'debian/libplatform-api-headers.install'
--- debian/libplatform-api-headers.install	2013-07-08 10:39:36 +0000
+++ debian/libplatform-api-headers.install	2013-07-18 10:12:43 +0000
@@ -1,4 +1,4 @@
-usr/include/ubuntu-1/status.h
-usr/include/ubuntu-1/unit.h
-usr/include/ubuntu-1/application
-usr/include/ubuntu-1/ui
+usr/include/ubuntu/status.h
+usr/include/ubuntu/unit.h
+usr/include/ubuntu/application
+usr/include/ubuntu/ui

=== removed file 'debian/libplatform-api-headers.links'
--- debian/libplatform-api-headers.links	2013-07-04 05:44:27 +0000
+++ debian/libplatform-api-headers.links	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/include/ubuntu-1 usr/include/ubuntu
\ No newline at end of file

=== modified file 'debian/libplatform-hardware-api-headers.install'
--- debian/libplatform-hardware-api-headers.install	2013-07-08 10:39:36 +0000
+++ debian/libplatform-hardware-api-headers.install	2013-07-18 10:12:43 +0000
@@ -1,1 +1,1 @@
-usr/include/ubuntu-1/hardware
+usr/include/ubuntu/hardware

=== modified file 'include/ubuntu/CMakeLists.txt'
--- include/ubuntu/CMakeLists.txt	2013-07-08 10:39:36 +0000
+++ include/ubuntu/CMakeLists.txt	2013-07-18 10:12:43 +0000
@@ -6,7 +6,7 @@
 
 install(
   FILES ${UBUNTU_HEADERS}
-  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}
+  DESTINATION include/ubuntu
 )
 
 add_subdirectory(application)

=== modified file 'include/ubuntu/application/CMakeLists.txt'
--- include/ubuntu/application/CMakeLists.txt	2013-06-22 15:05:04 +0000
+++ include/ubuntu/application/CMakeLists.txt	2013-07-18 10:12:43 +0000
@@ -11,7 +11,7 @@
 
 install(
   FILES ${UBUNTU_APPLICATION_HEADERS}
-  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application
+  DESTINATION include/ubuntu/application
 )
 
 add_subdirectory(sensors)

=== modified file 'include/ubuntu/application/sensors/CMakeLists.txt'
--- include/ubuntu/application/sensors/CMakeLists.txt	2013-06-11 11:05:25 +0000
+++ include/ubuntu/application/sensors/CMakeLists.txt	2013-07-18 10:12:43 +0000
@@ -8,7 +8,7 @@
 
 install(
   FILES ${UBUNTU_APPLICATION_SENSORS_HEADERS}
-  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/sensors
+  DESTINATION include/ubuntu/application/sensors
 )
 
 add_subdirectory(event)
\ No newline at end of file

=== modified file 'include/ubuntu/application/sensors/event/CMakeLists.txt'
--- include/ubuntu/application/sensors/event/CMakeLists.txt	2013-06-11 11:05:25 +0000
+++ include/ubuntu/application/sensors/event/CMakeLists.txt	2013-07-18 10:12:43 +0000
@@ -7,5 +7,5 @@
 
 install(
   FILES ${UBUNTU_APPLICATION_SENSORS_EVENT_HEADERS}
-  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/sensors/event
+  DESTINATION include/ubuntu/application/sensors/event
 )
\ No newline at end of file

=== modified file 'include/ubuntu/application/ui/CMakeLists.txt'
--- include/ubuntu/application/ui/CMakeLists.txt	2013-06-11 11:05:25 +0000
+++ include/ubuntu/application/ui/CMakeLists.txt	2013-07-18 10:12:43 +0000
@@ -19,7 +19,7 @@
 
 install(
   FILES ${UBUNTU_APPLICATION_UI_HEADERS}
-  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/ui
+  DESTINATION include/ubuntu/application/ui
 )
 
 add_subdirectory(input)
\ No newline at end of file

=== modified file 'include/ubuntu/application/ui/input/CMakeLists.txt'
--- include/ubuntu/application/ui/input/CMakeLists.txt	2013-06-11 11:05:25 +0000
+++ include/ubuntu/application/ui/input/CMakeLists.txt	2013-07-18 10:12:43 +0000
@@ -5,5 +5,5 @@
 
 install(
   FILES ${UBUNTU_APPLICATION_UI_INPUT_HEADERS}
-  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/ui/input
+  DESTINATION include/ubuntu/application/ui/input
 )
\ No newline at end of file

=== modified file 'include/ubuntu/hardware/CMakeLists.txt'
--- include/ubuntu/hardware/CMakeLists.txt	2013-07-08 10:39:36 +0000
+++ include/ubuntu/hardware/CMakeLists.txt	2013-07-18 10:12:43 +0000
@@ -5,5 +5,5 @@
 
 install(
   FILES ${UBUNTU_HARDWARE_HEADERS}
-  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/hardware
+  DESTINATION include/ubuntu/hardware
 )
\ No newline at end of file

=== modified file 'include/ubuntu/ui/CMakeLists.txt'
--- include/ubuntu/ui/CMakeLists.txt	2013-06-11 11:05:25 +0000
+++ include/ubuntu/ui/CMakeLists.txt	2013-07-18 10:12:43 +0000
@@ -1,4 +1,4 @@
 install(
   FILES ubuntu_ui_session_service.h
-  DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/ui
+  DESTINATION include/ubuntu/ui
 )
\ No newline at end of file

=== modified file 'src/mirserver/CMakeLists.txt'
--- src/mirserver/CMakeLists.txt	2013-07-10 20:23:01 +0000
+++ src/mirserver/CMakeLists.txt	2013-07-18 10:12:43 +0000
@@ -35,4 +35,4 @@
 )
 
 install(TARGETS ubuntu_application_api_mirserver ${INSTALL_TARGETS_DEFAULT_ARGS})
-install(FILES ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application)
+install(FILES ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu/application)