platform-api

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

  1. fix-1202309
  2. Merge into trunk
Proposed by Thomas Voß
Status: Merged
Approved by: Łukasz Zemczak
Approved revision: 94
Merged at revision: 94
Proposed branch: lp:~thomas-voss/platform-api/fix-1202309
Merge into: lp:platform-api
Diff against target: 147 lines (+15/-16)
13 files modified
data/ubuntu-platform-api.pc.in (+1/-1)
debian/libplatform-api-headers.install (+4/-4)
debian/libplatform-api-headers.links (+0/-1)
debian/libplatform-hardware-api-headers.install (+1/-1)
include/ubuntu/CMakeLists.txt (+1/-1)
include/ubuntu/application/CMakeLists.txt (+1/-1)
include/ubuntu/application/sensors/CMakeLists.txt (+1/-1)
include/ubuntu/application/sensors/event/CMakeLists.txt (+1/-1)
include/ubuntu/application/ui/CMakeLists.txt (+1/-1)
include/ubuntu/application/ui/input/CMakeLists.txt (+1/-1)
include/ubuntu/hardware/CMakeLists.txt (+1/-1)
include/ubuntu/ui/CMakeLists.txt (+1/-1)
src/mirserver/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~thomas-voss/platform-api/fix-1202309
Reviewer Review Type Date Requested Status
Łukasz Zemczak Approve
Dimitri John Ledkov Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+175482@code.launchpad.net

Commit message

Remove versioned include directories.

Description of the change

Remove versioned include directories.

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Dimitri John Ledkov (xnox) wrote :

yes, this is correct for now.

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

I guess this makes sense right now. +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
6Name: @CMAKE_PROJECT_NAME@6Name: @CMAKE_PROJECT_NAME@
7Description: Ubuntu's platform abstraction layer.7Description: Ubuntu's platform abstraction layer.
8Version: @UBUNTU_PLATFORM_API_VERSION_MAJOR@.@UBUNTU_PLATFORM_API_VERSION_MINOR@.@UBUNTU_PLATFORM_API_VERSION_PATCH@8Version: @UBUNTU_PLATFORM_API_VERSION_MAJOR@.@UBUNTU_PLATFORM_API_VERSION_MINOR@.@UBUNTU_PLATFORM_API_VERSION_PATCH@
9Cflags: -I${includedir}/ubuntu-@UBUNTU_PLATFORM_API_VERSION_MAJOR@9Cflags: -I${includedir}/ubuntu
1010
=== 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 @@
1usr/include/ubuntu-1/status.h1usr/include/ubuntu/status.h
2usr/include/ubuntu-1/unit.h2usr/include/ubuntu/unit.h
3usr/include/ubuntu-1/application3usr/include/ubuntu/application
4usr/include/ubuntu-1/ui4usr/include/ubuntu/ui
55
=== 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 @@
1usr/include/ubuntu-1 usr/include/ubuntu
2\ No newline at end of file0\ No newline at end of file
31
=== 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 @@
1usr/include/ubuntu-1/hardware1usr/include/ubuntu/hardware
22
=== 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 @@
66
7install(7install(
8 FILES ${UBUNTU_HEADERS}8 FILES ${UBUNTU_HEADERS}
9 DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}9 DESTINATION include/ubuntu
10)10)
1111
12add_subdirectory(application)12add_subdirectory(application)
1313
=== 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 @@
1111
12install(12install(
13 FILES ${UBUNTU_APPLICATION_HEADERS}13 FILES ${UBUNTU_APPLICATION_HEADERS}
14 DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application14 DESTINATION include/ubuntu/application
15)15)
1616
17add_subdirectory(sensors)17add_subdirectory(sensors)
1818
=== 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 @@
88
9install(9install(
10 FILES ${UBUNTU_APPLICATION_SENSORS_HEADERS}10 FILES ${UBUNTU_APPLICATION_SENSORS_HEADERS}
11 DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/sensors11 DESTINATION include/ubuntu/application/sensors
12)12)
1313
14add_subdirectory(event)14add_subdirectory(event)
15\ No newline at end of file15\ No newline at end of file
1616
=== 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 @@
77
8install(8install(
9 FILES ${UBUNTU_APPLICATION_SENSORS_EVENT_HEADERS}9 FILES ${UBUNTU_APPLICATION_SENSORS_EVENT_HEADERS}
10 DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/sensors/event10 DESTINATION include/ubuntu/application/sensors/event
11)11)
12\ No newline at end of file12\ No newline at end of file
1313
=== 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 @@
1919
20install(20install(
21 FILES ${UBUNTU_APPLICATION_UI_HEADERS}21 FILES ${UBUNTU_APPLICATION_UI_HEADERS}
22 DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/ui22 DESTINATION include/ubuntu/application/ui
23)23)
2424
25add_subdirectory(input)25add_subdirectory(input)
26\ No newline at end of file26\ No newline at end of file
2727
=== 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 @@
55
6install(6install(
7 FILES ${UBUNTU_APPLICATION_UI_INPUT_HEADERS}7 FILES ${UBUNTU_APPLICATION_UI_INPUT_HEADERS}
8 DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application/ui/input8 DESTINATION include/ubuntu/application/ui/input
9)9)
10\ No newline at end of file10\ No newline at end of file
1111
=== 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 @@
55
6install(6install(
7 FILES ${UBUNTU_HARDWARE_HEADERS}7 FILES ${UBUNTU_HARDWARE_HEADERS}
8 DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/hardware8 DESTINATION include/ubuntu/hardware
9)9)
10\ No newline at end of file10\ No newline at end of file
1111
=== 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 @@
1install(1install(
2 FILES ubuntu_ui_session_service.h2 FILES ubuntu_ui_session_service.h
3 DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/ui3 DESTINATION include/ubuntu/ui
4)4)
5\ No newline at end of file5\ No newline at end of file
66
=== 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 @@
35)35)
3636
37install(TARGETS ubuntu_application_api_mirserver ${INSTALL_TARGETS_DEFAULT_ARGS})37install(TARGETS ubuntu_application_api_mirserver ${INSTALL_TARGETS_DEFAULT_ARGS})
38install(FILES ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu-${UBUNTU_PLATFORM_API_VERSION_MAJOR}/application)38install(FILES ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu/application)

Subscribers

People subscribed via source and target branches