Merge lp:~ricmm/platform-api/v2-loader-first-take into lp:platform-api

[Ricardo Mendoza]

V2 - loadable backend architecture

Unmerged revisions

214. By Ricardo Mendoza on 2014-05-02

API/ABI bump to ver2
 * Loadable backend architecture
 * Global test separation
 * Groundwork for platform hardware API v2

213. By Ricardo Mendoza on 2014-04-28

Merge lp:~thomas-voss/platform-api/hw-alarms-api

212. By Ricardo Mendoza on 2014-04-28

lp:~phablet-team/platform-api/to-gcc-4.8

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-03-31 17:59:47 +0000
+++ CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -2,7 +2,7 @@
 
 project(ubuntu-platform-api)
 
-set(UBUNTU_PLATFORM_API_VERSION_MAJOR 1)
+set(UBUNTU_PLATFORM_API_VERSION_MAJOR 2)
 set(UBUNTU_PLATFORM_API_VERSION_MINOR 0)
 set(UBUNTU_PLATFORM_API_VERSION_PATCH 0)
 
@@ -57,37 +57,19 @@
   ON
 )
 
-option(
-  ENABLE_MIRSERVER_IMPLEMENTATION
-  "Enable mirserver based platorm API implementation"
-  OFF
-)
-
-if(ENABLE_MIRSERVER_IMPLEMENTATION)
-  find_package(PkgConfig)
-  pkg_check_modules(MIRSERVER REQUIRED mirserver)
-endif(ENABLE_MIRSERVER_IMPLEMENTATION)
-
-option(
-  ENABLE_MIRCLIENT_IMPLEMENTATION
-  "Enable mirclient based platform API implementation"
-  OFF
-)
-
-if(ENABLE_MIRCLIENT_IMPLEMENTATION)
-  find_package(PkgConfig)
-  pkg_check_modules(MIRCLIENT REQUIRED mirclient)
-
-  find_package(Protobuf REQUIRED)
-  if(PROTOBUF_PROTOC_EXECUTABLE STREQUAL "PROTOBUF_PROTOC_EXECUTABLE-NOTFOUND")
-    message(SEND_ERROR "protoc executable not found! Missing protobuf-compiler package?")
-  endif()
-endif(ENABLE_MIRCLIENT_IMPLEMENTATION)
-
-if(ENABLE_MIRCLIENT_IMPLEMENTATION OR ENABLE_MIRSERVER_IMPLEMENTATION)
-  pkg_check_modules(MIRCOMMON REQUIRED mircommon)
+find_package(PkgConfig)
+pkg_check_modules(MIRSERVER REQUIRED mirserver)
+
+find_package(PkgConfig)
+pkg_check_modules(MIRCLIENT REQUIRED mirclient)
+
+find_package(Protobuf REQUIRED)
+if(PROTOBUF_PROTOC_EXECUTABLE STREQUAL "PROTOBUF_PROTOC_EXECUTABLE-NOTFOUND")
+  message(SEND_ERROR "protoc executable not found! Missing protobuf-compiler package?")
 endif()
 
+pkg_check_modules(MIRCOMMON REQUIRED mircommon)
+
 # Try to find hybris, and disable hybris from build if not found
 find_library(Hybris
   NAMES hybris-common

=== modified file 'android/default/default_ubuntu_application_sensor.cpp'
--- android/default/default_ubuntu_application_sensor.cpp	2013-06-28 20:13:22 +0000
+++ android/default/default_ubuntu_application_sensor.cpp	2014-05-02 12:23:55 +0000
@@ -199,40 +199,49 @@
     return toHz(s->min_delay());
 }
 
-float
+UStatus
 ua_sensors_proximity_get_min_value(
-    UASensorsProximity* sensor)
+    UASensorsProximity* sensor,
+    float* value)
 {
-    if (sensor == NULL)
-        return -1;
-
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
+    
     ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
     auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
-    return s->min_value();
+    *value = s->min_value();
+
+    return U_STATUS_SUCCESS;
 }
 
-float
+UStatus
 ua_sensors_proximity_get_max_value(
-    UASensorsProximity* sensor)
+    UASensorsProximity* sensor,
+    float* value)
 {
-    if (sensor == NULL)
-        return -1;
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
 
     ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
     auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
-    return s->max_value();
+    *value = s->max_value();
+
+    return U_STATUS_SUCCESS;
 }
 
-float
+UStatus
 ua_sensors_proximity_get_resolution(
-    UASensorsProximity* sensor)
+    UASensorsProximity* sensor,
+    float* value)
 {
-    if (sensor == NULL)
-        return -1;
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
 
     ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
     auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
-    return s->resolution();
+    *value = s->resolution();
+
+    return U_STATUS_SUCCESS;
 }
 
 void
@@ -334,40 +343,49 @@
     return toHz(s->min_delay());
 }
 
-float
+UStatus
 ua_sensors_light_get_min_value(
-    UASensorsLight* sensor)
+    UASensorsLight* sensor,
+    float* value)
 {
-    if (sensor == NULL)
-        return -1;
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
 
     ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
     auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
-    return s->min_value();
+    *value = s->min_value();
+
+    return U_STATUS_SUCCESS;
 }
 
-float
+UStatus
 ua_sensors_light_get_max_value(
-    UASensorsLight* sensor)
+    UASensorsLight* sensor,
+    float* value)
 {
-    if (sensor == NULL)
-        return -1;
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
 
     ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
     auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
-    return s->max_value();
+    *value = s->max_value();
+
+    return U_STATUS_SUCCESS;
 }
 
-float
+UStatus
 ua_sensors_light_get_resolution(
-    UASensorsLight* sensor)
+    UASensorsLight* sensor,
+    float* value)
 {
-    if (sensor == NULL)
-        return -1;
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
 
     ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
     auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
-    return s->resolution();
+    *value = s->resolution();
+
+    return U_STATUS_SUCCESS;
 }
 
 void
@@ -400,12 +418,18 @@
     return ev->value->get_timestamp();
 }
 
-float
+UStatus
 uas_light_event_get_light(
-    UASLightEvent* event)
+    UASLightEvent* event,
+    float* value)
 {
+    if (event == NULL || value == NULL)
+        return U_STATUS_ERROR;
+
     auto ev = static_cast<Holder<ubuntu::application::sensors::LightEvent::Ptr>*>(event);
-    return ev->value->get_light();
+    *value = ev->value->get_light();
+
+    return U_STATUS_SUCCESS;
 }
 
 /*
@@ -464,40 +488,49 @@
     return toHz(s->min_delay());
 }
 
-float
+UStatus
 ua_sensors_accelerometer_get_min_value(
-    UASensorsAccelerometer* sensor)
+    UASensorsAccelerometer* sensor,
+    float* value)
 {
-    if (sensor == NULL)
-        return -1;
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
 
     ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
     auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
-    return s->min_value();
+    *value = s->min_value();
+
+    return U_STATUS_SUCCESS;
 }
 
-float
+UStatus
 ua_sensors_accelerometer_get_max_value(
-    UASensorsAccelerometer* sensor)
+    UASensorsAccelerometer* sensor,
+    float* value)
 {
-    if (sensor == NULL)
-        return -1;
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
 
     ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
     auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
-    return s->max_value();
+    *value = s->max_value();
+
+    return U_STATUS_SUCCESS;
 }
 
-float
+UStatus
 ua_sensors_accelerometer_get_resolution(
-    UASensorsAccelerometer* sensor)
+    UASensorsAccelerometer* sensor,
+    float* value)
 {
-    if (sensor == NULL)
-        return -1;
+    if (sensor == NULL || value == NULL)
+        return U_STATUS_ERROR;
 
     ALOGI("%s():%d", __PRETTY_FUNCTION__, __LINE__);
     auto s = static_cast<ubuntu::application::sensors::Sensor*>(sensor);
-    return s->resolution();
+    *value = s->resolution();
+
+    return U_STATUS_SUCCESS;
 }
 
 void
@@ -529,26 +562,44 @@
     return ev->value->get_timestamp();
 }
 
-float
+UStatus
 uas_accelerometer_event_get_acceleration_x(
-    UASAccelerometerEvent* event)
+    UASAccelerometerEvent* event,
+    float* value)
 {
+    if (event == NULL || value == NULL)
+        return U_STATUS_ERROR;
+    
     auto ev = static_cast<Holder<ubuntu::application::sensors::AccelerometerEvent::Ptr>*>(event);
-    return ev->value->get_x();
+    *value = ev->value->get_x();
+
+    return U_STATUS_SUCCESS;
 }
 
-float
+UStatus
 uas_accelerometer_event_get_acceleration_y(
-    UASAccelerometerEvent* event)
+    UASAccelerometerEvent* event,
+    float* value)
 {
+    if (event == NULL || value == NULL)
+        return U_STATUS_ERROR;
+
     auto ev = static_cast<Holder<ubuntu::application::sensors::AccelerometerEvent::Ptr>*>(event);
-    return ev->value->get_y();
+    *value = ev->value->get_y();
+
+    return U_STATUS_SUCCESS;
 }
 
-float
+UStatus
 uas_accelerometer_event_get_acceleration_z(
-    UASAccelerometerEvent* event)
+    UASAccelerometerEvent* event,
+    float* value)
 {
+    if (event == NULL || value == NULL)
+        return U_STATUS_ERROR;
+
     auto ev = static_cast<Holder<ubuntu::application::sensors::AccelerometerEvent::Ptr>*>(event);
-    return ev->value->get_z();
+    *value = ev->value->get_z();
+
+    return U_STATUS_SUCCESS;
 }

=== modified file 'android/hybris/Android.mk'
--- android/hybris/Android.mk	2014-01-22 05:28:18 +0000
+++ android/hybris/Android.mk	2014-05-02 12:23:55 +0000
@@ -25,6 +25,7 @@
 	ubuntu_application_api_for_hybris.cpp \
 	ubuntu_application_gps_for_hybris.cpp \
 	ubuntu_application_sensors_for_hybris.cpp \
+	ubuntu_hardware_alarms_for_hybris.cpp \
 	../default/default_ubuntu_application_sensor.cpp \
 	../default/default_ubuntu_application_ui.cpp \
 	../default/default_ubuntu_application.cpp \
@@ -65,8 +66,6 @@
 LOCAL_SHARED_LIBRARIES := \
 	libandroidfw \
 	libutils \
-	libEGL \
-	libGLESv2 \
 	libubuntu_application_api
 
 include $(BUILD_EXECUTABLE)
@@ -211,6 +210,29 @@
 
 include $(CLEAR_VARS)
 
+LOCAL_CFLAGS += -std=gnu++0x
+
+LOCAL_C_INCLUDES := \
+	$(UPAPI_PATH)/include \
+	$(UPAPI_PATH)/android/include
+
+LOCAL_SRC_FILES:= \
+	test_alarms_api.cpp \
+
+LOCAL_MODULE:= direct_ubuntu_hardware_alarm_api_test
+LOCAL_MODULE_TAGS := optional
+
+LOCAL_SHARED_LIBRARIES := \
+	libandroidfw \
+	libutils \
+	libEGL \
+	libGLESv2 \
+	libubuntu_application_api
+
+include $(BUILD_EXECUTABLE)
+
+include $(CLEAR_VARS)
+
 LOCAL_CFLAGS += \
 	-DANDROID_VERSION_MAJOR=$(ANDROID_VERSION_MAJOR) \
 	-DANDROID_VERSION_MINOR=$(ANDROID_VERSION_MINOR) \

=== added file 'android/hybris/test_alarms_api.cpp'
--- android/hybris/test_alarms_api.cpp	1970-01-01 00:00:00 +0000
+++ android/hybris/test_alarms_api.cpp	2014-05-02 12:23:55 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <thomas.voss@canonicalcom>
+ */
+
+#include <ubuntu/hardware/alarm.h>
+
+#include <cstdio>
+#include <ctime>
+
+int main(int argc, char** argv)
+{
+    UHardwareAlarm alarm = u_hardware_alarm_create();
+
+    if (!alarm)
+    {
+        printf("Error creating handle to hardware alarms.\n");
+        return 1;
+    }
+
+    // Alarm in two seconds.
+    timespec ts { 2, 0 };
+
+
+    UStatus rc = u_hardware_alarm_set_relative_to_with_behavior(
+        alarm,
+        U_HARDWARE_ALARM_TIME_REFERENCE_NOW,
+        U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE,
+        &ts);
+
+    if (rc != U_STATUS_SUCCESS)
+    {
+        printf("Problem setting hardware alarm.\n");
+        return 1;
+    }
+
+    UHardwareAlarmWaitResult wait_result;
+    rc = u_hardware_alarm_wait_for_next_alarm(alarm, &wait_result);
+
+    if (rc != U_STATUS_SUCCESS)
+    {
+        printf("Problem waiting for hardware alarm to go off.\n");
+        return 1;
+    }
+
+    printf("Successfully created and waited for a hw alarm.\n");
+
+    return 0;
+}

=== modified file 'android/hybris/test_sensors_c_api.cpp'
--- android/hybris/test_sensors_c_api.cpp	2013-05-30 02:03:42 +0000
+++ android/hybris/test_sensors_c_api.cpp	2014-05-02 12:23:55 +0000
@@ -27,10 +27,13 @@
 void on_new_accelerometer_event(UASAccelerometerEvent* event, void* context)
 {
     printf("%s \n", __PRETTY_FUNCTION__);
+    float x; uas_accelerometer_event_get_acceleration_x(event, &x);
+    float y; uas_accelerometer_event_get_acceleration_x(event, &y);
+    float z; uas_accelerometer_event_get_acceleration_x(event, &z);
     printf("\ttime: %llu\n", uas_accelerometer_event_get_timestamp(event));
-    printf("\tx: %f\n", uas_accelerometer_event_get_acceleration_x(event));
-    printf("\ty: %f\n", uas_accelerometer_event_get_acceleration_y(event));
-    printf("\tz: %f\n", uas_accelerometer_event_get_acceleration_z(event));
+    printf("\tx: %f\n", x);
+    printf("\ty: %f\n", y);
+    printf("\tz: %f\n", z);
 }
 
 void on_new_proximity_event(UASProximityEvent* event, void* context)
@@ -57,7 +60,8 @@
 {
     printf("%s \n", __PRETTY_FUNCTION__);
     printf("\ttime: %llu\n", uas_light_event_get_timestamp(event));
-    printf("\tlight: %f\n", uas_light_event_get_light(event));
+    float light; uas_light_event_get_light(event, &light);
+    printf("\tlight: %f\n", light);
 }
 
 int main(int argc, char** argv)

=== added file 'android/hybris/ubuntu_hardware_alarms_for_hybris.cpp'
--- android/hybris/ubuntu_hardware_alarms_for_hybris.cpp	1970-01-01 00:00:00 +0000
+++ android/hybris/ubuntu_hardware_alarms_for_hybris.cpp	2014-05-02 12:23:55 +0000
@@ -0,0 +1,197 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+
+#include <ubuntu/hardware/alarm.h>
+
+#include <cstdio>
+#include <cstdlib>
+#include <string.h>
+
+#include <errno.h>
+#include <fcntl.h>
+
+#include <linux/ioctl.h>
+#include <linux/android_alarm.h>
+
+#include <utils/Log.h>
+
+class UbuntuHardwareAlarm
+{
+  public:
+    static UbuntuHardwareAlarm& instance()
+    {
+        static UbuntuHardwareAlarm ha;
+        return ha;
+    }
+
+    int wait_for()
+    {
+        int result{-1};
+
+        do
+        {
+            result = ::ioctl(fd, ANDROID_ALARM_WAIT);
+        } while (result < 0 && errno == EINTR);
+
+        if (result < 0)
+            ALOGE("Waiting for hw alarm failed with: %s", strerror(errno));
+
+        return result;
+    }
+
+    bool set(UHardwareAlarmTimeReference time_reference,
+             UHardwareAlarmSleepBehavior behavior,
+             const struct timespec *ts)
+    {
+        int type = 0;
+
+        if (time_reference == U_HARDWARE_ALARM_TIME_REFERENCE_NOW)
+            switch(behavior)
+            {
+                case U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE:
+                    type = ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK;
+                    break;
+                case U_HARDWARE_ALARM_SLEEP_BEHAVIOR_KEEP_DEVICE_ASLEEP:
+                    type = ANDROID_ALARM_ELAPSED_REALTIME_MASK;
+                    break;
+            }
+        else if (time_reference == U_HARDWARE_ALARM_TIME_REFERENCE_BOOT)
+            switch(behavior)
+            {
+                case U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE:
+                    type = ANDROID_ALARM_RTC_WAKEUP_MASK;
+                    break;
+                case U_HARDWARE_ALARM_SLEEP_BEHAVIOR_KEEP_DEVICE_ASLEEP:
+                    type = ANDROID_ALARM_RTC_MASK;
+                    break;
+            }
+
+        int result = ::ioctl(fd, ANDROID_ALARM_SET(type), ts);
+
+        if (result < 0)
+            ALOGE("Unable to set alarm: %s", strerror(errno));
+
+        return not (result < 0);
+    }
+
+    bool is_valid() const
+    {
+        return valid;
+    }
+
+  private:
+    UbuntuHardwareAlarm() : fd(open("/dev/alarm", O_RDWR)),
+                            valid(true)
+    {
+        if (fd == -1) 
+        {
+            ALOGE("Could not open /dev/alarm: %s", strerror(errno));
+            valid = false;
+        }
+    }
+
+    ~UbuntuHardwareAlarm()
+    {
+        // No need to check if fd is valid here.
+        // Ctor would have thrown if fd was invalid.
+        ::close(fd);
+    }
+
+    int fd;
+    bool valid;
+};
+
+UHardwareAlarm
+u_hardware_alarm_create()
+{
+    auto result = &UbuntuHardwareAlarm::instance();
+
+    if (result)
+        if (result->is_valid())
+            return result;
+
+    return NULL;
+}
+
+void
+u_hardware_alarm_ref(
+    UHardwareAlarm alarm)
+{
+    // Considering a singleton pattern here, just voiding the argument.
+    (void) alarm;
+}
+
+void
+u_hardware_alarm_unref(
+    UHardwareAlarm alarm)
+{
+    // Considering a singleton pattern here, just voiding the argument.
+    (void) alarm;
+}
+
+UStatus
+u_hardware_alarm_set_timezone(
+    UHardwareAlarm alarm,
+    const struct timezone *tz)
+{
+    int result = settimeofday(NULL, tz);
+
+    if (result < 0)
+        return U_STATUS_ERROR;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus
+u_hardware_alarm_set_relative_to_with_behavior(
+    UHardwareAlarm alarm,
+    UHardwareAlarmTimeReference time_reference,
+    UHardwareAlarmSleepBehavior behavior,
+    const struct timespec *ts)
+{
+    return alarm->set(time_reference, behavior, ts) ?
+            U_STATUS_SUCCESS :
+            U_STATUS_ERROR;
+
+}
+
+UStatus
+u_hardware_alarm_wait_for_next_alarm(
+    UHardwareAlarm alarm,
+    UHardwareAlarmWaitResult *result)
+{
+    int rc = alarm->wait_for();
+
+    if (rc < 0)
+        return U_STATUS_ERROR;
+
+    if ((rc & ANDROID_ALARM_RTC_MASK) ||
+        (rc & ANDROID_ALARM_RTC_WAKEUP_MASK))
+        result->reference = U_HARDWARE_ALARM_TIME_REFERENCE_BOOT;
+    else if ((rc & ANDROID_ALARM_ELAPSED_REALTIME_MASK) ||
+             (rc & ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK))
+        result->reference = U_HARDWARE_ALARM_TIME_REFERENCE_NOW;
+
+    if ((rc & ANDROID_ALARM_RTC_WAKEUP_MASK) ||
+        (rc & ANDROID_ALARM_ELAPSED_REALTIME_WAKEUP_MASK))
+        result->sleep_behavior = U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE;
+    else
+        result->sleep_behavior = U_HARDWARE_ALARM_SLEEP_BEHAVIOR_KEEP_DEVICE_ASLEEP;
+
+    return U_STATUS_SUCCESS;
+}

=== modified file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	2013-06-13 12:04:14 +0000
+++ data/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -2,7 +2,11 @@
   ubuntu-platform-api.pc.in ubuntu-platform-api.pc @ONLY
 )
 
+configure_file(
+  ubuntu-platform-hardware-api.pc.in ubuntu-platform-hardware-api.pc @ONLY
+)
+
 install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-platform-api.pc
+  FILES ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-platform-api.pc ${CMAKE_CURRENT_BINARY_DIR}/ubuntu-platform-hardware-api.pc
   DESTINATION lib/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig
-)
\ No newline at end of file
+)

=== added file 'data/ubuntu-platform-hardware-api.pc.in'
--- data/ubuntu-platform-hardware-api.pc.in	1970-01-01 00:00:00 +0000
+++ data/ubuntu-platform-hardware-api.pc.in	2014-05-02 12:23:55 +0000
@@ -0,0 +1,10 @@
+prefix=@CMAKE_INSTALL_PREFIX@
+exec_prefix=${prefix}
+libdir=${prefix}/@LIB_INSTALL_DIR@
+includedir=${exec_prefix}/include
+ 
+Name: ubuntu_platform_hardware_api
+Description: Ubuntu's platform hardware abstraction layer.
+Version: @UBUNTU_PLATFORM_API_VERSION_MAJOR@.@UBUNTU_PLATFORM_API_VERSION_MINOR@.@UBUNTU_PLATFORM_API_VERSION_PATCH@
+Libs: -L${libdir} -lubuntu_platform_hardware_api
+Cflags: -I${includedir}/ubuntu

=== modified file 'debian/control'
--- debian/control	2014-04-15 20:23:07 +0000
+++ debian/control	2014-05-02 12:23:55 +0000
@@ -7,8 +7,6 @@
                doxygen,
                graphviz,
                libgles2-mesa-dev,
-               gcc-4.7,
-               g++-4.7,
                libhybris-common-dev,
                pkg-config,
                libmirclient-dev (>= 0.1.8),
@@ -55,7 +53,7 @@
  should build depend on the libplatform-hardware-api-dev package instead, which
  will pull this package as well.
 
-Package: libplatform-api1-dev
+Package: libplatform-api-dev
 Section: libdevel
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends},
@@ -63,36 +61,36 @@
 Depends: ${misc:Depends},
          libgles2-mesa-dev,
          libplatform-api-headers (= ${binary:Version}),
-         libubuntu-application-api1 | libplatform-api1,
-         libubuntu-application-api-mirserver1 (= ${binary:Version}),
-         libubuntu-application-api-mirclient1 (= ${binary:Version}),
+         libubuntu-application-api2,
          ${misc:Depends},
 Suggests: libplatform-api1-doc,
 Description: Platform API for system level capabilities (development)
  This package provides the development library and headers (via
  dependency) for the Platform API.
 
-Package: libubuntu-application-api-mirserver1
+Package: libubuntu-application-api-touch2
 Section: libs
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Implementation of the Platform API for a Mir server
- This package provides the implementation of the Platform API to
- provide a server instance of Mir.
+         libubuntu-application-api2
+Description: Implementation of the Ubuntu Platform API for Touch
+ This package provides the implementation of the Ubuntu Platform API
+ for Ubuntu Touch clients.
 
-Package: libubuntu-application-api-mirclient1
+Package: libubuntu-application-api-desktop2
 Section: libs
 Pre-Depends: ${misc:Pre-Depends},
 Multi-Arch: same
 Architecture: any
 Depends: ${misc:Depends},
          ${shlibs:Depends},
-Description: Implementation of the Platform API for a Mir client
- This package provides the implementation of the Platform API to
- allow a client to connect to a Mir server.
+         libubuntu-application-api2
+Description: Implementation of the Ubuntu Platform API for a Desktop
+ This package provides the implementation of the Ubuntu Platform API
+ for Ubuntu Desktop clients.
 
 Package: libplatform-hardware-api1-dev
 Section: libdevel
@@ -108,11 +106,11 @@
  This package provides the development library and headers (via
  dependency) for the hw-access portions of the Platform API.
 
-Package: libplatform-api1-doc
+Package: libplatform-api2-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends},
-         libplatform-api1-dev,
+         libplatform-api2-dev,
 Description: Platform API for system level capabilities (development)
  This package provides the developer documentation for the Platform API.
 
@@ -131,7 +129,7 @@
  The produced library should be used via libhybris, to communicate with the
  Android userspace, which is where the device drivers live.
 
-Package: libubuntu-application-api1
+Package: libubuntu-application-api2
 Section: libs
 Architecture: any
 Replaces: libplatform-api1-hybris (<< 0.18.3)
@@ -146,7 +144,7 @@
  The produced library should be used via libhybris, to communicate with the
  Android userspace, which is where the Ubuntu Application Manager lives.
 
-Package: libubuntu-application-api-test1
+Package: libubuntu-application-api-test2
 Section: libs
 Architecture: any
 Pre-Depends: ${misc:Pre-Depends},
@@ -162,33 +160,14 @@
  .
  For now this provides simulated sensors.
 
-Package: libplatform-api1-hybris-tests
-Architecture: any
-Depends: ${misc:Depends},
-         ${shlibs:Depends},
-         libubuntu-application-api1 (= ${binary:Version}),
-Description: Hybris implementation of the Platform API (tests)
- This package provides the test cases for the hybris implementation
- of the Platform API.
-
-Package: libubuntu-platform-api1-dev
-Section: oldlibs
-Architecture: all
-Depends: ${misc:Depends},
-         libplatform-api1-dev (= ${binary:Version}),
-Description: dummy transitional package for libplatform-api1-dev
- This is dummy transitional package, please use libplatform-api1-dev instead.
- .
- This package can be safely removed.
-
-Package: libplatform-api1-hybris
-Section: oldlibs
-Architecture: all
-Depends: libubuntu-application-api1,
-         ${misc:Depends},
-Description: dummy transitional package for libplatform-api1-hybris
- This is a dummy transitional package, please use libubuntu-application-api1
- instead.
+#Package: libplatform-api1-hybris-tests
+#Architecture: any
+#Depends: ${misc:Depends},
+#         ${shlibs:Depends},
+#         libubuntu-application-api1 (= ${binary:Version}),
+#Description: Hybris implementation of the Platform API (tests)
+# This package provides the test cases for the hybris implementation
+# of the Platform API.
 
 Package: libplatform-hardware-api1-hybris
 Section: oldlibs

=== removed file 'debian/libplatform-api1-dev.install'
--- debian/libplatform-api1-dev.install	2013-08-23 13:53:42 +0000
+++ debian/libplatform-api1-dev.install	1970-01-01 00:00:00 +0000
@@ -1,4 +0,0 @@
-usr/lib/*/libubuntu_application_api.so
-usr/lib/*/libubuntu_application_api_mirclient.so
-usr/lib/*/libubuntu_application_api_mirserver.so
-usr/lib/*/pkgconfig/ubuntu-platform-api.pc

=== removed file 'debian/libplatform-api1-doc.doc-base'
--- debian/libplatform-api1-doc.doc-base	2013-07-05 16:34:47 +0000
+++ debian/libplatform-api1-doc.doc-base	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-Document: ubuntu-platform-api 
-Title: Ubuntu Platform API Reference Documentation
-Author: Thomas Voß
-Abstract: This is the reference documentation for the Ubuntu Platform API
-Section: Debian
-Format: HTML
-Index: /usr/share/doc/ubuntu-platform-api/html/index.html
-Files: /usr/share/doc/ubuntu-platform-api/html/*.html

=== removed file 'debian/libplatform-api1-doc.install'
--- debian/libplatform-api1-doc.install	2013-07-05 13:50:50 +0000
+++ debian/libplatform-api1-doc.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/share/doc/ubuntu-platform-api
\ No newline at end of file

=== removed file 'debian/libplatform-api1-hybris-tests.install'
--- debian/libplatform-api1-hybris-tests.install	2013-08-17 05:22:31 +0000
+++ debian/libplatform-api1-hybris-tests.install	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-usr/bin/test_android_gps_api
-usr/bin/test_android_sensors_api
-usr/bin/test_android_ubuntu_app_api
-usr/bin/test_android_ubuntu_app_api_multiple_surfaces
-usr/bin/test_android_ubuntu_session_api
-usr/bin/test_ubuntu_app_api_location_service
\ No newline at end of file

=== modified file 'debian/libplatform-hardware-api1-dev.install'
--- debian/libplatform-hardware-api1-dev.install	2013-07-08 10:39:36 +0000
+++ debian/libplatform-hardware-api1-dev.install	2014-05-02 12:23:55 +0000
@@ -1,2 +1,2 @@
 usr/lib/*/libubuntu_platform_hardware_api.so
-
+usr/lib/*/pkgconfig/ubuntu-platform-hardware-api.pc

=== removed file 'debian/libubuntu-application-api-mirclient1.install'
--- debian/libubuntu-application-api-mirclient1.install	2013-08-08 17:41:19 +0000
+++ debian/libubuntu-application-api-mirclient1.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/libubuntu_application_api_mirclient.so.*

=== removed file 'debian/libubuntu-application-api-mirclient1.symbols'
--- debian/libubuntu-application-api-mirclient1.symbols	2013-09-23 05:39:42 +0000
+++ debian/libubuntu-application-api-mirclient1.symbols	1970-01-01 00:00:00 +0000
@@ -1,126 +0,0 @@
-libubuntu_application_api_mirclient.so.1 libubuntu-application-api-mirclient1 #MINVER#
- u_application_description_destroy@Base 0.18.3+13.10.20130813
- u_application_description_get_application_id@Base 0.18.3+13.10.20130813
- u_application_description_get_application_lifecycle_delegate@Base 0.18.3+13.10.20130813
- u_application_description_new@Base 0.18.3+13.10.20130813
- u_application_description_set_application_id@Base 0.18.3+13.10.20130813
- u_application_description_set_application_lifecycle_delegate@Base 0.18.3+13.10.20130813
- u_application_id_compare@Base 0.18.3+13.10.20130813
- u_application_id_destroy@Base 0.18.3+13.10.20130813
- u_application_id_new_from_stringn@Base 0.18.3+13.10.20130813
- u_application_instance_destroy@Base 0.18.3+13.10.20130813
- u_application_instance_new_from_description_with_options@Base 0.18.3+13.10.20130813
- u_application_instance_ref@Base 0.18.3+13.10.20130813
- u_application_instance_run@Base 0.18.3+13.10.20130813
- u_application_instance_unref@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_destroy@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_application_about_to_stop_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_application_resumed_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_context@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_new@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_ref@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_application_about_to_stop_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_application_resumed_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_context@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_unref@Base 0.18.3+13.10.20130813
- u_application_options_destroy@Base 0.18.3+13.10.20130813
- u_application_options_get_form_factor@Base 0.18.3+13.10.20130813
- u_application_options_get_operation_mode@Base 0.18.3+13.10.20130813
- u_application_options_get_stage@Base 0.18.3+13.10.20130813
- u_application_options_new_from_cmd_line@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_disable@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_enable@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_new@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_sensors_light_disable@Base 0.18.3+13.10.20130813
- ua_sensors_light_enable@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_light_new@Base 0.18.3+13.10.20130813
- ua_sensors_light_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_disable@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_enable@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_new@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_ui_display_destroy@Base 0.18.3+13.10.20130813
- ua_ui_display_get_native_type@Base 0.18.3+13.10.20130813
- ua_ui_display_new_with_index@Base 0.18.3+13.10.20130813
- ua_ui_display_query_horizontal_res@Base 0.18.3+13.10.20130813
- ua_ui_display_query_vertical_res@Base 0.18.3+13.10.20130813
- ua_ui_get_clipboard_content@Base 0.18.3+13.10.20130813
- ua_ui_session_new_with_properties@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_new@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_set_remote_pid@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_set_type@Base 0.18.3+13.10.20130813
- ua_ui_set_clipboard_content@Base 0.18.3+13.10.20130813
- ua_ui_window_destroy@Base 0.18.3+13.10.20130813
- ua_ui_window_get_native_type@Base 0.18.3+13.10.20130813
- ua_ui_window_hide@Base 0.18.3+13.10.20130813
- ua_ui_window_move@Base 0.18.3+13.10.20130813
- ua_ui_window_new_for_application_with_properties@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_destroy@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_get_title@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_new_for_normal_window@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_role@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_titlen@Base 0.18.3+13.10.20130813
- ua_ui_window_request_fullscreen@Base 0.18.3+13.10.20130813
- ua_ui_window_resize@Base 0.18.3+13.10.20130813
- ua_ui_window_show@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_x@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_y@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_z@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_timestamp@Base 0.18.3+13.10.20130813
- uas_light_event_get_light@Base 0.18.3+13.10.20130813
- uas_light_event_get_timestamp@Base 0.18.3+13.10.20130813
- uas_proximity_event_get_distance@Base 0.18.3+13.10.20130813
- uas_proximity_event_get_timestamp@Base 0.18.3+13.10.20130813
- ua_location_heading_update_get_heading_in_degree@Base 0.19+13.10.20130919.3
- ua_location_heading_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_heading_update_ref@Base 0.19+13.10.20130919.3
- ua_location_heading_update_unref@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_altitude_in_meter@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_latitude_in_degree@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_longitude_in_degree@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_position_update_has_altitude@Base 0.19+13.10.20130919.3
- ua_location_position_update_ref@Base 0.19+13.10.20130919.3
- ua_location_position_update_unref@Base 0.19+13.10.20130919.3
- ua_location_service_controller_disable_gps@Base 0.19+13.10.20130919.3
- ua_location_service_controller_disable_service@Base 0.19+13.10.20130919.3
- ua_location_service_controller_enable_gps@Base 0.19+13.10.20130919.3
- ua_location_service_controller_enable_service@Base 0.19+13.10.20130919.3
- ua_location_service_controller_query_status@Base 0.19+13.10.20130919.3
- ua_location_service_controller_ref@Base 0.19+13.10.20130919.3
- ua_location_service_controller_set_status_changed_handler@Base 0.19+13.10.20130919.3
- ua_location_service_controller_unref@Base 0.19+13.10.20130919.3
- ua_location_service_create_controller@Base 0.19+13.10.20130919.3
- ua_location_service_create_session_for_high_accuracy@Base 0.19+13.10.20130919.3
- ua_location_service_create_session_for_low_accuracy@Base 0.19+13.10.20130919.3
- ua_location_service_session_ref@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_heading_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_position_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_velocity_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_heading_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_position_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_velocity_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_heading_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_position_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_velocity_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_unref@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_ref@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_unref@Base 0.19+13.10.20130919.3
- ua_url_dispatcher_session@Base 0.19+13.10.20130919.3
- ua_url_dispatcher_session_open@Base 0.19+13.10.20130919.3
\ No newline at end of file

=== removed file 'debian/libubuntu-application-api-mirserver1.install'
--- debian/libubuntu-application-api-mirserver1.install	2013-08-08 17:41:19 +0000
+++ debian/libubuntu-application-api-mirserver1.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/libubuntu_application_api_mirserver.so.*

=== removed file 'debian/libubuntu-application-api-mirserver1.symbols'
--- debian/libubuntu-application-api-mirserver1.symbols	2013-09-23 05:39:42 +0000
+++ debian/libubuntu-application-api-mirserver1.symbols	1970-01-01 00:00:00 +0000
@@ -1,128 +0,0 @@
-libubuntu_application_api_mirserver.so.1 libubuntu-application-api-mirserver1 #MINVER#
- u_application_description_destroy@Base 0.18.3+13.10.20130813
- u_application_description_get_application_id@Base 0.18.3+13.10.20130813
- u_application_description_get_application_lifecycle_delegate@Base 0.18.3+13.10.20130813
- u_application_description_new@Base 0.18.3+13.10.20130813
- u_application_description_set_application_id@Base 0.18.3+13.10.20130813
- u_application_description_set_application_lifecycle_delegate@Base 0.18.3+13.10.20130813
- u_application_id_compare@Base 0.18.3+13.10.20130813
- u_application_id_destroy@Base 0.18.3+13.10.20130813
- u_application_id_new_from_stringn@Base 0.18.3+13.10.20130813
- u_application_instance_destroy@Base 0.18.3+13.10.20130813
- u_application_instance_new_from_description_with_options@Base 0.18.3+13.10.20130813
- u_application_instance_ref@Base 0.18.3+13.10.20130813
- u_application_instance_run@Base 0.18.3+13.10.20130813
- u_application_instance_unref@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_destroy@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_application_about_to_stop_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_application_resumed_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_get_context@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_new@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_ref@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_application_about_to_stop_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_application_resumed_cb@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_set_context@Base 0.18.3+13.10.20130813
- u_application_lifecycle_delegate_unref@Base 0.18.3+13.10.20130813
- u_application_options_destroy@Base 0.18.3+13.10.20130813
- u_application_options_get_form_factor@Base 0.18.3+13.10.20130813
- u_application_options_get_operation_mode@Base 0.18.3+13.10.20130813
- u_application_options_get_stage@Base 0.18.3+13.10.20130813
- u_application_options_new_from_cmd_line@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_disable@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_enable@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_new@Base 0.18.3+13.10.20130813
- ua_sensors_accelerometer_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_sensors_light_disable@Base 0.18.3+13.10.20130813
- ua_sensors_light_enable@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_light_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_light_new@Base 0.18.3+13.10.20130813
- ua_sensors_light_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_disable@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_enable@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_max_value@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_min_delay@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_min_value@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_get_resolution@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_new@Base 0.18.3+13.10.20130813
- ua_sensors_proximity_set_reading_cb@Base 0.18.3+13.10.20130813
- ua_ui_display_destroy@Base 0.18.3+13.10.20130813
- ua_ui_display_get_native_type@Base 0.18.3+13.10.20130813
- ua_ui_display_new_with_index@Base 0.18.3+13.10.20130813
- ua_ui_display_query_horizontal_res@Base 0.18.3+13.10.20130813
- ua_ui_display_query_vertical_res@Base 0.18.3+13.10.20130813
- ua_ui_get_clipboard_content@Base 0.18.3+13.10.20130813
- ua_ui_mirserver_finish@Base 0.18.3+13.10.20130823
- ua_ui_mirserver_init@Base 0.18.3+13.10.20130823
- ua_ui_session_new_with_properties@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_new@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_set_remote_pid@Base 0.18.3+13.10.20130813
- ua_ui_session_properties_set_type@Base 0.18.3+13.10.20130813
- ua_ui_set_clipboard_content@Base 0.18.3+13.10.20130813
- ua_ui_window_destroy@Base 0.18.3+13.10.20130813
- ua_ui_window_get_native_type@Base 0.18.3+13.10.20130813
- ua_ui_window_hide@Base 0.18.3+13.10.20130813
- ua_ui_window_move@Base 0.18.3+13.10.20130813
- ua_ui_window_new_for_application_with_properties@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_destroy@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_get_title@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_new_for_normal_window@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_role@Base 0.18.3+13.10.20130813
- ua_ui_window_properties_set_titlen@Base 0.18.3+13.10.20130813
- ua_ui_window_request_fullscreen@Base 0.18.3+13.10.20130813
- ua_ui_window_resize@Base 0.18.3+13.10.20130813
- ua_ui_window_show@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_x@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_y@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_acceleration_z@Base 0.18.3+13.10.20130813
- uas_accelerometer_event_get_timestamp@Base 0.18.3+13.10.20130813
- uas_light_event_get_light@Base 0.18.3+13.10.20130813
- uas_light_event_get_timestamp@Base 0.18.3+13.10.20130813
- uas_proximity_event_get_distance@Base 0.18.3+13.10.20130813
- uas_proximity_event_get_timestamp@Base 0.18.3+13.10.20130813
- ua_location_heading_update_get_heading_in_degree@Base 0.19+13.10.20130919.3
- ua_location_heading_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_heading_update_ref@Base 0.19+13.10.20130919.3
- ua_location_heading_update_unref@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_altitude_in_meter@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_latitude_in_degree@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_longitude_in_degree@Base 0.19+13.10.20130919.3
- ua_location_position_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_position_update_has_altitude@Base 0.19+13.10.20130919.3
- ua_location_position_update_ref@Base 0.19+13.10.20130919.3
- ua_location_position_update_unref@Base 0.19+13.10.20130919.3
- ua_location_service_controller_disable_gps@Base 0.19+13.10.20130919.3
- ua_location_service_controller_disable_service@Base 0.19+13.10.20130919.3
- ua_location_service_controller_enable_gps@Base 0.19+13.10.20130919.3
- ua_location_service_controller_enable_service@Base 0.19+13.10.20130919.3
- ua_location_service_controller_query_status@Base 0.19+13.10.20130919.3
- ua_location_service_controller_ref@Base 0.19+13.10.20130919.3
- ua_location_service_controller_set_status_changed_handler@Base 0.19+13.10.20130919.3
- ua_location_service_controller_unref@Base 0.19+13.10.20130919.3
- ua_location_service_create_controller@Base 0.19+13.10.20130919.3
- ua_location_service_create_session_for_high_accuracy@Base 0.19+13.10.20130919.3
- ua_location_service_create_session_for_low_accuracy@Base 0.19+13.10.20130919.3
- ua_location_service_session_ref@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_heading_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_position_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_set_velocity_updates_handler@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_heading_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_position_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_start_velocity_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_heading_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_position_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_stop_velocity_updates@Base 0.19+13.10.20130919.3
- ua_location_service_session_unref@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_get_timestamp@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_ref@Base 0.19+13.10.20130919.3
- ua_location_velocity_update_unref@Base 0.19+13.10.20130919.3
- ua_url_dispatcher_session@Base 0.19+13.10.20130919.3
- ua_url_dispatcher_session_open@Base 0.19+13.10.20130919.3
\ No newline at end of file

=== removed file 'debian/libubuntu-application-api-test1.docs'
--- debian/libubuntu-application-api-test1.docs	2014-01-08 15:17:41 +0000
+++ debian/libubuntu-application-api-test1.docs	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-src/ubuntu/testbackend/README.md

=== removed file 'debian/libubuntu-application-api-test1.install'
--- debian/libubuntu-application-api-test1.install	2014-01-08 15:17:41 +0000
+++ debian/libubuntu-application-api-test1.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/libubuntu_application_api_test.so.*

=== removed file 'debian/libubuntu-application-api1.install'
--- debian/libubuntu-application-api1.install	2013-07-16 21:20:58 +0000
+++ debian/libubuntu-application-api1.install	1970-01-01 00:00:00 +0000
@@ -1,1 +0,0 @@
-usr/lib/*/libubuntu_application_api.so.*

=== removed file 'debian/libubuntu-application-api1.symbols'
--- debian/libubuntu-application-api1.symbols	2013-08-26 18:07:34 +0000
+++ debian/libubuntu-application-api1.symbols	1970-01-01 00:00:00 +0000
@@ -1,130 +0,0 @@
-libubuntu_application_api.so.1 libubuntu-application-api1 #MINVER#
- u_application_description_destroy@Base 0.18.1daily13.06.21
- u_application_description_new@Base 0.18.1daily13.06.21
- u_application_description_set_application_id@Base 0.18.1daily13.06.21
- u_application_description_set_application_lifecycle_delegate@Base 0.18.1daily13.06.21
- u_application_id_compare@Base 0.18.1daily13.06.21
- u_application_id_destroy@Base 0.18.1daily13.06.21
- u_application_id_new_from_stringn@Base 0.18.1daily13.06.21
- u_application_instance_new_from_description_with_options@Base 0.18.1daily13.06.21
- u_application_lifecycle_delegate_new@Base 0.18.1daily13.06.21
- u_application_lifecycle_delegate_ref@Base 0.18.1daily13.06.21
- u_application_lifecycle_delegate_set_application_about_to_stop_cb@Base 0.18.1daily13.06.21
- u_application_lifecycle_delegate_set_application_resumed_cb@Base 0.18.1daily13.06.21
- u_application_lifecycle_delegate_set_context@Base 0.18.1daily13.06.21
- u_application_lifecycle_delegate_unref@Base 0.18.1daily13.06.21
- u_application_options_destroy@Base 0.18.1daily13.06.21
- u_application_options_get_form_factor@Base 0.18.1daily13.06.21
- u_application_options_get_stage@Base 0.18.1daily13.06.21
- u_application_options_new_from_cmd_line@Base 0.18.1daily13.06.21
- ua_location_heading_update_get_timestamp@Base 0.18.3+13.10.20130807
- ua_location_heading_update_ref@Base 0.18.3+13.10.20130807
- ua_location_heading_update_unref@Base 0.18.3+13.10.20130807
- ua_location_heading_update_get_heading_in_degree@Base 0.18.3+13.10.20130815.1
- ua_location_position_update_get_altitude_in_meter@Base 0.18.3+13.10.20130807
- ua_location_position_update_get_latitude_in_degree@Base 0.18.3+13.10.20130807
- ua_location_position_update_get_longitude_in_degree@Base 0.18.3+13.10.20130807
- ua_location_position_update_get_timestamp@Base 0.18.3+13.10.20130807
- ua_location_position_update_has_altitude@Base 0.18.3+13.10.20130807
- ua_location_position_update_ref@Base 0.18.3+13.10.20130807
- ua_location_position_update_unref@Base 0.18.3+13.10.20130807
- ua_location_service_create_session_for_high_accuracy@Base 0.18.3+13.10.20130807
- ua_location_service_create_session_for_low_accuracy@Base 0.18.3+13.10.20130807
- ua_location_service_create_controller@Base 0.18.3+13.10.20130826.3
- ua_location_service_session_ref@Base 0.18.3+13.10.20130807
- ua_location_service_session_set_heading_updates_handler@Base 0.18.3+13.10.20130807
- ua_location_service_session_set_position_updates_handler@Base 0.18.3+13.10.20130807
- ua_location_service_session_set_velocity_updates_handler@Base 0.18.3+13.10.20130807
- ua_location_service_session_start_heading_updates@Base 0.18.3+13.10.20130807
- ua_location_service_session_start_position_updates@Base 0.18.3+13.10.20130807
- ua_location_service_session_start_velocity_updates@Base 0.18.3+13.10.20130807
- ua_location_service_session_stop_heading_updates@Base 0.18.3+13.10.20130807
- ua_location_service_session_stop_position_updates@Base 0.18.3+13.10.20130807
- ua_location_service_session_stop_velocity_updates@Base 0.18.3+13.10.20130807
- ua_location_service_session_unref@Base 0.18.3+13.10.20130807
- ua_location_velocity_update_get_timestamp@Base 0.18.3+13.10.20130807
- ua_location_velocity_update_get_velocity_in_meters_per_second@Base 0.18.3+13.10.20130807
- ua_location_velocity_update_ref@Base 0.18.3+13.10.20130807
- ua_location_velocity_update_unref@Base 0.18.3+13.10.20130807
- ua_sensors_accelerometer_disable@Base 0.18.1daily13.06.21
- ua_sensors_accelerometer_enable@Base 0.18.1daily13.06.21
- ua_sensors_accelerometer_get_max_value@Base 0.18.1daily13.06.21
- ua_sensors_accelerometer_get_min_delay@Base 0.18.1daily13.06.21
- ua_sensors_accelerometer_get_min_value@Base 0.18.1daily13.06.21
- ua_sensors_accelerometer_get_resolution@Base 0.18.1daily13.06.21
- ua_sensors_accelerometer_new@Base 0.18.1daily13.06.21
- ua_sensors_accelerometer_set_reading_cb@Base 0.18.1daily13.06.21
- ua_sensors_light_enable@Base 0.18.1daily13.06.21
- ua_sensors_light_disable@Base 0.18.2+13.10.20130708
- ua_sensors_light_get_max_value@Base 0.18.1daily13.06.21
- ua_sensors_light_get_min_delay@Base 0.18.1daily13.06.21
- ua_sensors_light_get_min_value@Base 0.18.1daily13.06.21
- ua_sensors_light_get_resolution@Base 0.18.1daily13.06.21
- ua_sensors_light_new@Base 0.18.1daily13.06.21
- ua_sensors_light_set_reading_cb@Base 0.18.1daily13.06.21
- ua_sensors_proximity_disable@Base 0.18.1daily13.06.21
- ua_sensors_proximity_enable@Base 0.18.1daily13.06.21
- ua_sensors_proximity_get_max_value@Base 0.18.1daily13.06.21
- ua_sensors_proximity_get_min_delay@Base 0.18.1daily13.06.21
- ua_sensors_proximity_get_min_value@Base 0.18.1daily13.06.21
- ua_sensors_proximity_get_resolution@Base 0.18.1daily13.06.21
- ua_sensors_proximity_new@Base 0.18.1daily13.06.21
- ua_sensors_proximity_set_reading_cb@Base 0.18.1daily13.06.21
- ua_ui_display_destroy@Base 0.18.1daily13.06.21
- ua_ui_display_get_native_type@Base 0.18.1daily13.06.21
- ua_ui_display_new_with_index@Base 0.18.1daily13.06.21
- ua_ui_display_query_horizontal_res@Base 0.18.1daily13.06.21
- ua_ui_display_query_vertical_res@Base 0.18.1daily13.06.21
- ua_ui_get_clipboard_content@Base 0.18.1daily13.06.21
- ua_ui_session_new_with_properties@Base 0.18.1daily13.06.21
- ua_ui_session_properties_new@Base 0.18.1daily13.06.21
- ua_ui_session_properties_set_remote_pid@Base 0.18.1daily13.06.21
- ua_ui_session_properties_set_type@Base 0.18.1daily13.06.21
- ua_ui_set_clipboard_content@Base 0.18.1daily13.06.21
- ua_ui_window_destroy@Base 0.18.1daily13.06.21
- ua_ui_window_get_native_type@Base 0.18.1daily13.06.21
- ua_ui_window_hide@Base 0.18.1daily13.06.21
- ua_ui_window_move@Base 0.18.1daily13.06.21
- ua_ui_window_new_for_application_with_properties@Base 0.18.1daily13.06.21
- ua_ui_window_properties_destroy@Base 0.18.1daily13.06.21
- ua_ui_window_properties_get_title@Base 0.18.1daily13.06.21
- ua_ui_window_properties_new_for_normal_window@Base 0.18.1daily13.06.21
- ua_ui_window_properties_set_input_cb_and_ctx@Base 0.18.1daily13.06.21
- ua_ui_window_properties_set_role@Base 0.18.1daily13.06.21
- ua_ui_window_properties_set_titlen@Base 0.18.1daily13.06.21
- ua_ui_window_request_fullscreen@Base 0.18.1daily13.06.21
- ua_ui_window_resize@Base 0.18.1daily13.06.21
- ua_ui_window_show@Base 0.18.1daily13.06.21
- ua_url_dispatcher_session@Base 0.18.3+13.10.20130823-0ubuntu1
- ua_url_dispatcher_session_open@Base 0.18.3+13.10.20130823-0ubuntu1
- uas_accelerometer_event_get_acceleration_x@Base 0.18.1daily13.06.21
- uas_accelerometer_event_get_acceleration_y@Base 0.18.1daily13.06.21
- uas_accelerometer_event_get_acceleration_z@Base 0.18.1daily13.06.21
- uas_accelerometer_event_get_timestamp@Base 0.18.1daily13.06.21
- uas_light_event_get_light@Base 0.18.1daily13.06.21
- uas_light_event_get_timestamp@Base 0.18.1daily13.06.21
- uas_proximity_event_get_distance@Base 0.18.1daily13.06.21
- uas_proximity_event_get_timestamp@Base 0.18.1daily13.06.21
- ubuntu_ui_install_task_controller@Base 0.18.1daily13.06.21
- ubuntu_ui_report_notification_invisible@Base 0.18.1daily13.06.21
- ubuntu_ui_report_notification_visible@Base 0.18.1daily13.06.21
- ubuntu_ui_report_osk_invisible@Base 0.18.1daily13.06.21
- ubuntu_ui_report_osk_visible@Base 0.18.1daily13.06.21
- ubuntu_ui_session_focus_running_session_with_id@Base 0.18.1daily13.06.21
- ubuntu_ui_session_install_session_lifecycle_observer@Base 0.18.1daily13.06.21
- ubuntu_ui_session_properties_get_application_instance_id@Base 0.18.1daily13.06.21
- ubuntu_ui_session_properties_get_application_stage_hint@Base 0.18.1daily13.06.21
- ubuntu_ui_session_properties_get_desktop_file_hint@Base 0.18.1daily13.06.21
- ubuntu_ui_session_snapshot_running_session_with_id@Base 0.18.1daily13.06.21
- ubuntu_ui_session_trigger_switch_to_well_known_application@Base 0.18.1daily13.06.21
- ubuntu_ui_session_unfocus_running_sessions@Base 0.18.1daily13.06.21
- ubuntu_ui_set_surface_trap@Base 0.18.1daily13.06.21
- ubuntu_ui_unset_surface_trap@Base 0.18.1daily13.06.21
- ua_location_service_controller_disable_gps@Base 0.18.3+13.10.20130826
- ua_location_service_controller_disable_service@Base 0.18.3+13.10.20130826
- ua_location_service_controller_enable_gps@Base 0.18.3+13.10.20130826
- ua_location_service_controller_enable_service@Base 0.18.3+13.10.20130826
- ua_location_service_controller_query_status@Base 0.18.3+13.10.20130826
- ua_location_service_controller_ref@Base 0.18.3+13.10.20130826
- ua_location_service_controller_set_status_changed_handler@Base 0.18.3+13.10.20130826
- ua_location_service_controller_unref@Base 0.18.3+13.10.20130826

=== modified file 'debian/rules' (properties changed: +x to -x)
--- debian/rules	2014-01-31 13:35:28 +0000
+++ debian/rules	2014-05-02 12:23:55 +0000
@@ -2,14 +2,11 @@
 
 DPKG_GENSYMBOLS_CHECK_LEVEL = 4
 
-export C=gcc-4.7
-export CXX=g++-4.7
-
 %:
 	dh $@
 
 override_dh_auto_configure:
-	dh_auto_configure -- -DENABLE_MIRCLIENT_IMPLEMENTATION=true -DENABLE_MIRSERVER_IMPLEMENTATION=true
+	dh_auto_configure 
 
 override_dh_install:
 	dh_install --fail-missing

=== modified file 'doc/Doxyfile.in'
--- doc/Doxyfile.in	2013-07-05 09:13:31 +0000
+++ doc/Doxyfile.in	2014-05-02 12:23:55 +0000
@@ -1684,7 +1684,7 @@
 # explicitly to a value larger than 0 to get control over the balance
 # between CPU load and processing speed.
 
-DOT_NUM_THREADS        = 0
+DOT_NUM_THREADS        = 1 
 
 # By default doxygen will use the Helvetica font for all dot files that
 # doxygen generates. When you want a differently looking font you can specify

=== modified file 'include/ubuntu/application/sensors/accelerometer.h'
--- include/ubuntu/application/sensors/accelerometer.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/sensors/accelerometer.h	2014-05-02 12:23:55 +0000
@@ -85,9 +85,10 @@
      * \returns The minimum value that can be reported by the sensor.
      * \param[in] sensor The sensor instance to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     ua_sensors_accelerometer_get_min_value(
-        UASensorsAccelerometer* sensor);
+        UASensorsAccelerometer* sensor,
+        float* value);
 
     /**
      * \brief Queries the maximum value that can be reported by the sensor.
@@ -95,9 +96,10 @@
      * \returns The maximum value that can be reported by the sensor.
      * \param[in] sensor The sensor instance to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     ua_sensors_accelerometer_get_max_value(
-        UASensorsAccelerometer* sensor);
+        UASensorsAccelerometer* sensor,
+        float* value);
 
     /**
      * \brief Queries the numeric resolution supported by the sensor
@@ -105,9 +107,10 @@
      * \returns The numeric resolution supported by the sensor.
      * \param[in] sensor The sensor instance to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     ua_sensors_accelerometer_get_resolution(
-        UASensorsAccelerometer* sensor);
+        UASensorsAccelerometer* sensor,
+        float* value);
 
     /**
      * \brief Set the callback to be invoked whenever a new sensor reading is available.

=== modified file 'include/ubuntu/application/sensors/event/accelerometer.h'
--- include/ubuntu/application/sensors/event/accelerometer.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/sensors/event/accelerometer.h	2014-05-02 12:23:55 +0000
@@ -49,9 +49,10 @@
      * \returns The acceleration in x-axis direction.
      * \param[in] event The reading to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     uas_accelerometer_event_get_acceleration_x(
-        UASAccelerometerEvent* event);
+        UASAccelerometerEvent* event,
+        float* value);
 
     /**
      * \brief Query the acceleration in y-axis direction.
@@ -59,9 +60,10 @@
      * \returns The acceleration in y-axis direction.
      * \param[in] event The reading to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     uas_accelerometer_event_get_acceleration_y(
-        UASAccelerometerEvent* event);
+        UASAccelerometerEvent* event,
+        float* value);
 
     /**
      * \brief Query the acceleration in z-axis direction.
@@ -69,9 +71,10 @@
      * \returns The acceleration in z-axis direction.
      * \param[in] event The reading to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     uas_accelerometer_event_get_acceleration_z(
-        UASAccelerometerEvent* event);
+        UASAccelerometerEvent* event,
+        float* value);
 
 #ifdef __cplusplus
 }

=== modified file 'include/ubuntu/application/sensors/event/light.h'
--- include/ubuntu/application/sensors/event/light.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/sensors/event/light.h	2014-05-02 12:23:55 +0000
@@ -49,9 +49,10 @@
      * \returns The ambient light level.
      * \param[in] event The reading to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     uas_light_event_get_light(
-        UASLightEvent* event);
+        UASLightEvent* event,
+        float* value);
 
 #ifdef __cplusplus
 }

=== modified file 'include/ubuntu/application/sensors/light.h'
--- include/ubuntu/application/sensors/light.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/sensors/light.h	2014-05-02 12:23:55 +0000
@@ -85,9 +85,10 @@
      * \returns The minimum value that can be reported by the sensor.
      * \param[in] sensor The sensor instance to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     ua_sensors_light_get_min_value(
-        UASensorsLight* sensor);
+        UASensorsLight* sensor,
+        float* value);
 
     /**
      * \brief Queries the maximum value that can be reported by the sensor.
@@ -95,9 +96,10 @@
      * \returns The maximum value that can be reported by the sensor.
      * \param[in] sensor The sensor instance to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     ua_sensors_light_get_max_value(
-        UASensorsLight* sensor);
+        UASensorsLight* sensor,
+        float* value);
 
     /**
      * \brief Queries the numeric resolution supported by the sensor
@@ -105,9 +107,10 @@
      * \returns The numeric resolution supported by the sensor.
      * \param[in] sensor The sensor instance to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     ua_sensors_light_get_resolution(
-        UASensorsLight* sensor);
+        UASensorsLight* sensor,
+        float* value);
 
     /**
      * \brief Set the callback to be invoked whenever a new sensor reading is available.

=== modified file 'include/ubuntu/application/sensors/proximity.h'
--- include/ubuntu/application/sensors/proximity.h	2013-08-22 06:32:14 +0000
+++ include/ubuntu/application/sensors/proximity.h	2014-05-02 12:23:55 +0000
@@ -85,9 +85,10 @@
      * \returns The minimum value that can be reported by the sensor.
      * \param[in] sensor The sensor instance to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     ua_sensors_proximity_get_min_value(
-        UASensorsProximity* sensor);
+        UASensorsProximity* sensor,
+        float* value);
 
     /**
      * \brief Queries the maximum value that can be reported by the sensor.
@@ -95,9 +96,10 @@
      * \returns The maximum value that can be reported by the sensor.
      * \param[in] sensor The sensor instance to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     ua_sensors_proximity_get_max_value(
-        UASensorsProximity* sensor);
+        UASensorsProximity* sensor,
+        float* value);
 
     /**
      * \brief Queries the numeric resolution supported by the sensor
@@ -105,9 +107,10 @@
      * \returns The numeric resolution supported by the sensor.
      * \param[in] sensor The sensor instance to be queried.
      */
-    UBUNTU_DLL_PUBLIC float
+    UBUNTU_DLL_PUBLIC UStatus
     ua_sensors_proximity_get_resolution(
-        UASensorsProximity* sensor);
+        UASensorsProximity* sensor,
+        float* value);
 
     /**
      * \brief Set the callback to be invoked whenever a new sensor reading is available.

=== modified file 'include/ubuntu/application/sensors/ubuntu_application_sensors.h'
--- include/ubuntu/application/sensors/ubuntu_application_sensors.h	2013-08-22 07:17:47 +0000
+++ include/ubuntu/application/sensors/ubuntu_application_sensors.h	2014-05-02 12:23:55 +0000
@@ -18,6 +18,7 @@
 #ifndef UBUNTU_APPLICATION_SENSORS_C_API_H_
 #define UBUNTU_APPLICATION_SENSORS_C_API_H_
 
+#include <ubuntu/status.h>
 #include <ubuntu/visibility.h>
 
 #include <stdint.h>
@@ -139,15 +140,17 @@
     /** Returns the minimum valid value for the sensor_type.
      * \ingroup sensor_access
      */
-    UBUNTU_DLL_PUBLIC float ubuntu_sensor_get_sensor_min_value(ubuntu_sensor_type sensor_type);
+    UBUNTU_DLL_PUBLIC UStatus ubuntu_sensor_get_sensor_min_value(ubuntu_sensor_type sensor_type, float* value);
+
     /** Returns the maximum valid value for the sensor_type.
      * \ingroup sensor_access
      */
-    UBUNTU_DLL_PUBLIC float ubuntu_sensor_get_sensor_max_value(ubuntu_sensor_type sensor_type);
+    UBUNTU_DLL_PUBLIC UStatus ubuntu_sensor_get_sensor_max_value(ubuntu_sensor_type sensor_type, float* value);
+
     /** Returns the resolution of valid values for the sensor_type.
      * \ingroup sensor_access
      */
-    UBUNTU_DLL_PUBLIC float ubuntu_sensor_get_sensor_resolution(ubuntu_sensor_type sensor_type);
+    UBUNTU_DLL_PUBLIC UStatus ubuntu_sensor_get_sensor_resolution(ubuntu_sensor_type sensor_type, float* value);
 
     /** \example test_sensors_api.cpp */
 #ifdef __cplusplus

=== modified file 'include/ubuntu/hardware/CMakeLists.txt'
--- include/ubuntu/hardware/CMakeLists.txt	2013-07-18 09:08:17 +0000
+++ include/ubuntu/hardware/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -1,9 +1,10 @@
 set(
   UBUNTU_HARDWARE_HEADERS
+  alarm.h
   gps.h
 )
 
 install(
   FILES ${UBUNTU_HARDWARE_HEADERS}
   DESTINATION include/ubuntu/hardware
-)
\ No newline at end of file
+)

=== added file 'include/ubuntu/hardware/alarm.h'
--- include/ubuntu/hardware/alarm.h	1970-01-01 00:00:00 +0000
+++ include/ubuntu/hardware/alarm.h	2014-05-02 12:23:55 +0000
@@ -0,0 +1,98 @@
+/*
+ * Copyright © 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <[e-mail]>
+ */
+#ifndef UBUNTU_HARDWARE_ALARM_H_
+#define UBUNTU_HARDWARE_ALARM_H_
+
+#include <ubuntu/status.h>
+#include <ubuntu/visibility.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+/** The time reference that alarms are setup to. */
+typedef enum
+{
+    U_HARDWARE_ALARM_TIME_REFERENCE_BOOT, /**< Relative to the device's boot time, including sleep. */
+    U_HARDWARE_ALARM_TIME_REFERENCE_NOW /**< Relative from now on. */
+} UbuntuHardwareAlarmTimeReference;
+
+typedef UbuntuHardwareAlarmTimeReference UHardwareAlarmTimeReference;
+
+/** Describes if an alarm is able to wakup the device from sleep. */
+typedef enum
+{
+    /** Alarm will wakeup the device from sleep. */
+    U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE,
+    /** Alarm will not wakeup the device and will be delivered on the next wakeup of the device */
+    U_HARDWARE_ALARM_SLEEP_BEHAVIOR_KEEP_DEVICE_ASLEEP
+} UbuntuHardwareAlarmSleepBehavior;
+
+typedef UbuntuHardwareAlarmSleepBehavior UHardwareAlarmSleepBehavior;
+
+/** Bundles the time reference and sleep/wakeup behavior when waiting for an alarm to happen. */
+typedef struct
+{
+  UHardwareAlarmTimeReference reference;
+  UHardwareAlarmSleepBehavior sleep_behavior;
+} UbuntuHardwareAlarmWaitResult;
+
+typedef UbuntuHardwareAlarmWaitResult UHardwareAlarmWaitResult;
+
+/** Opaque type modelling access to the kernel/hw-level alarm capabilities. */
+typedef struct UbuntuHardwareAlarm* UHardwareAlarm;
+
+/** Creates an instance and/or increments its refcount. */
+UBUNTU_DLL_PUBLIC UHardwareAlarm
+u_hardware_alarm_create();
+
+/** Increments the instance's ref count. */
+UBUNTU_DLL_PUBLIC void
+u_hardware_alarm_ref(
+    UHardwareAlarm alarm);
+
+/** Decrements the instance's ref count. */
+UBUNTU_DLL_PUBLIC void
+u_hardware_alarm_unref(
+    UHardwareAlarm alarm);
+
+/** Reports a timezone change to kernel and HW. */
+UBUNTU_DLL_PUBLIC UStatus
+u_hardware_alarm_set_timezone(
+    UHardwareAlarm alarm,
+    const struct timezone *tz);
+
+/** Sets and arms a timer. */
+UBUNTU_DLL_PUBLIC UStatus
+u_hardware_alarm_set_relative_to_with_behavior(
+    UHardwareAlarm alarm,
+    UHardwareAlarmTimeReference time_reference,
+    UHardwareAlarmSleepBehavior behavior,
+    const struct timespec *ts);
+
+/** Blocks until the next alarm occurs. */
+UBUNTU_DLL_PUBLIC UStatus
+u_hardware_alarm_wait_for_next_alarm(
+    UHardwareAlarm alarm,
+    UHardwareAlarmWaitResult *result);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

=== modified file 'src/ubuntu/CMakeLists.txt'
--- src/ubuntu/CMakeLists.txt	2013-12-02 17:03:45 +0000
+++ src/ubuntu/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -1,10 +1,3 @@
-include_directories(
-  ${CMAKE_CURRENT_SOURCE_DIR}
-)
-
-add_subdirectory(application)
-add_subdirectory(testbackend)
-
 set(
   UBUNTU_APPLICATION_API_LINK_LIBRARIES
   
@@ -12,18 +5,42 @@
   ubuntu_application_url_dispatcher
 )
 
-if(ENABLE_HYBRIS_IMPLEMENTATION)
-  add_subdirectory(hybris/)
-endif()
-
-if(ENABLE_MIRSERVER_IMPLEMENTATION OR ENABLE_MIRCLIENT_IMPLEMENTATION)
-  add_subdirectory(mircommon/)
-endif()
-
-if(ENABLE_MIRSERVER_IMPLEMENTATION)
-  add_subdirectory(mirserver/)
-endif()
-
-if(ENABLE_MIRCLIENT_IMPLEMENTATION)
-  add_subdirectory(mirclient/)
-endif()
+add_subdirectory(common)
+add_subdirectory(desktop)
+add_subdirectory(touch)
+add_subdirectory(testbackend)
+
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
+
+add_library(
+  ubuntu_application_api SHARED
+  
+  ubuntu_application_api.cpp
+)
+
+include_directories(
+  ${CMAKE_BINARY_DIR}/include
+)
+
+target_link_libraries(
+  ubuntu_application_api
+
+  dl  
+  #${Hybris}
+)
+
+set_target_properties(
+  ubuntu_application_api
+  PROPERTIES
+  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
+  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
+)
+
+install(
+  TARGETS ubuntu_application_api
+  ${INSTALL_TARGETS_DEFAULT_ARGS}
+)
+
+#if(ENABLE_MIRCLIENT_IMPLEMENTATION)
+#  add_subdirectory(mirclient/)
+#endif()

=== added directory 'src/ubuntu/common'
=== added file 'src/ubuntu/common/CMakeLists.txt'
--- src/ubuntu/common/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/ubuntu/common/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -0,0 +1,8 @@
+include_directories(
+  ${CMAKE_CURRENT_SOURCE_DIR}
+)
+
+add_subdirectory(application)
+add_subdirectory(mircommon)
+add_subdirectory(mirclient)
+add_subdirectory(mirserver)

=== renamed directory 'src/ubuntu/application' => 'src/ubuntu/common/application'
=== renamed directory 'src/ubuntu/mirclient' => 'src/ubuntu/common/mirclient'
=== modified file 'src/ubuntu/common/mirclient/CMakeLists.txt'
--- src/ubuntu/mirclient/CMakeLists.txt	2014-02-07 14:32:44 +0000
+++ src/ubuntu/common/mirclient/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -13,11 +13,6 @@
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
 
-add_library(
-	ubuntu_application_api_mirclient SHARED
-	${SOURCES}
-)
-
 include_directories(
     ${CMAKE_BINARY_DIR}/include
     ${MIRCLIENT_INCLUDE_DIRS}
@@ -25,18 +20,17 @@
     ${CMAKE_CURRENT_BINARY_DIR}
 )
 
+add_library(
+	ubuntu_application_api_mirclient STATIC
+	${SOURCES}
+)
+
+SET(MIRCOMMON_LINK -Wl,--whole-archive ubuntu_application_api_mircommon -Wl,--no-whole-archive)
+
 target_link_libraries(
   ubuntu_application_api_mirclient
+
   ${MIRCLIENT_LDFLAGS} ${MIRCLIENT_LIBRARIES}
-  -Wl,--whole-archive ubuntu_application_api_mircommon ${UBUNTU_APPLICATION_API_LINK_LIBRARIES} -Wl,--no-whole-archive
   ${PROTOBUF_LIBRARIES}
-)
-
-set_target_properties(
-	ubuntu_application_api_mirclient
-	PROPERTIES
-	VERSION 1.0
-	SOVERSION 1
-)
-
-install(TARGETS ubuntu_application_api_mirclient ${INSTALL_TARGETS_DEFAULT_ARGS})
+#  ${MIRCOMMON_LINK}
+)

=== modified file 'src/ubuntu/common/mirclient/ubuntu_application_api_mirclient.cpp'
--- src/ubuntu/mirclient/ubuntu_application_api_mirclient.cpp	2014-02-07 14:32:44 +0000
+++ src/ubuntu/common/mirclient/ubuntu_application_api_mirclient.cpp	2014-05-02 12:23:55 +0000
@@ -86,6 +86,15 @@
 extern "C"
 {
 
+void u_application_init(void *args)
+{
+    (void) args;
+}
+
+void u_application_finish()
+{
+}
+
 // TODO<papi>: Eliminate global instance by adding Instance to some functions (i.e. display queries)
 // TODO: We can't take ownership of description and options until we get rid of the global instance
 // so we leak them.

=== renamed directory 'src/ubuntu/mircommon' => 'src/ubuntu/common/mircommon'
=== modified file 'src/ubuntu/common/mircommon/CMakeLists.txt'
--- src/ubuntu/mircommon/CMakeLists.txt	2014-02-17 22:40:09 +0000
+++ src/ubuntu/common/mircommon/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -7,19 +7,6 @@
   lifecycle_delegate_mir.cpp
   )
 
-if(ENABLE_HYBRIS_IMPLEMENTATION)
-  list(APPEND SOURCES
-    ../hybris/ubuntu_application_sensors_hybris.cpp
-    )
-  list(APPEND LINK_LIBRARIES
-    ${Hybris}
-    )
-else()
-  list(APPEND SOURCES
-    ubuntu_application_sensors_desktop.cpp
-    )
-endif()
-
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC --std=c++11")
 
 include_directories(
@@ -34,6 +21,5 @@
 target_link_libraries(
   ubuntu_application_api_mircommon
 
-  ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
   ${LINK_LIBRARIES}
   )

=== modified file 'src/ubuntu/common/mircommon/ubuntu_application_sensors_desktop.cpp'
--- src/ubuntu/mircommon/ubuntu_application_sensors_desktop.cpp	2013-06-05 23:47:51 +0000
+++ src/ubuntu/common/mircommon/ubuntu_application_sensors_desktop.cpp	2014-05-02 12:23:55 +0000
@@ -46,19 +46,34 @@
     return 0;
 }
 
-float ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer*)
-{
-    return 0.0;
-}
-
-float ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer*)
-{
-    return 0.0;
-}
-
-float ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer*)
-{
-    return 0.0;
+UStatus ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
 }
 
 void ua_sensors_accelerometer_set_reading_cb(UASensorsAccelerometer*, on_accelerometer_event_cb, void*)
@@ -71,19 +86,34 @@
     return 0;
 }
 
-float uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent*)
-{
-    return 0.0;
-}
-
-float uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent*)
-{
-    return 0.0;
-}
-
-float uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent*)
-{
-    return 0.0;
+UStatus uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
 }
 
 // Proximity Sensor
@@ -107,19 +137,34 @@
     return 0;
 }
 
-float ua_sensors_proximity_get_min_value(UASensorsProximity*)
-{
-    return 0.0;
-}
-
-float ua_sensors_proximity_get_max_value(UASensorsProximity*)
-{
-    return 0.0;
-}
-
-float ua_sensors_proximity_get_resolution(UASensorsProximity*)
-{
-    return 0.0;
+UStatus ua_sensors_proximity_get_min_value(UASensorsProximity*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_proximity_get_max_value(UASensorsProximity*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_proximity_get_resolution(UASensorsProximity*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
 }
 
 void ua_sensors_proximity_set_reading_cb(UASensorsProximity*, on_proximity_event_cb, void*)
@@ -159,19 +204,34 @@
     return 0;
 }
 
-float ua_sensors_light_get_min_value(UASensorsLight*)
-{
-    return 0.0;
-}
-
-float ua_sensors_light_get_max_value(UASensorsLight*)
-{
-    return 0.0;
-}
-
-float ua_sensors_light_get_resolution(UASensorsLight*)
-{
-    return 0.0;
+UStatus ua_sensors_light_get_min_value(UASensorsLight*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_light_get_max_value(UASensorsLight*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_light_get_resolution(UASensorsLight*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
 }
 
 void ua_sensors_light_set_reading_cb(UASensorsLight*, on_light_event_cb, void*)
@@ -184,7 +244,12 @@
     return 0;
 }
 
-float uas_light_event_get_light(UASLightEvent*)
+UStatus uas_light_event_get_light(UASLightEvent*, float* value)
 {
-    return 0.0;
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
 }

=== renamed directory 'src/ubuntu/mirserver' => 'src/ubuntu/common/mirserver'
=== modified file 'src/ubuntu/common/mirserver/CMakeLists.txt'
--- src/ubuntu/mirserver/CMakeLists.txt	2014-01-09 18:47:45 +0000
+++ src/ubuntu/common/mirserver/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -7,30 +7,23 @@
 
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
 
-add_library(
-	ubuntu_application_api_mirserver SHARED
-	${SOURCES}
-)
-
 include_directories(
     ${CMAKE_BINARY_DIR}/include
     ${MIRSERVER_INCLUDE_DIRS}
 )
 
+add_library(
+	ubuntu_application_api_mirserver STATIC
+	${SOURCES}
+)
+
+#ubuntu_application_api_d_sensors
+
 target_link_libraries(
 	ubuntu_application_api_mirserver
-        ${MIRSERVER_LDFLAGS} ${MIRSERVER_LIBRARIES}
-        -Wl,--whole-archive ubuntu_application_api_mircommon ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
-        -Wl,--no-whole-archive
-)
-
-
-set_target_properties(
-	ubuntu_application_api_mirserver
-	PROPERTIES
-	VERSION 1.0
-	SOVERSION 1
-)
-
-install(TARGETS ubuntu_application_api_mirserver ${INSTALL_TARGETS_DEFAULT_ARGS})
+
+    ${MIRSERVER_LDFLAGS} ${MIRSERVER_LIBRARIES}
+#    ${MIRCOMMON_LINK}
+)
+
 install(FILES ubuntu_application_api_mirserver_priv.h DESTINATION include/ubuntu/application)

=== modified file 'src/ubuntu/common/mirserver/ubuntu_application_api_mirserver.cpp'
--- src/ubuntu/mirserver/ubuntu_application_api_mirserver.cpp	2014-04-15 20:23:07 +0000
+++ src/ubuntu/common/mirserver/ubuntu_application_api_mirserver.cpp	2014-05-02 12:23:55 +0000
@@ -77,19 +77,28 @@
 
 extern "C"
 {
-void ua_ui_mirserver_init(mir::DefaultServerConfiguration& config)
+void u_application_init(void *args)
 {
+    mir::DefaultServerConfiguration* config = static_cast<mir::DefaultServerConfiguration*>(args);
     auto context = global_mirserver_context();
 
+<<<<<<< TREE
     context->display = config.the_display();
     context->buffer_allocator = config.the_buffer_allocator();
     context->surface_coordinator = config.the_surface_coordinator();
     context->session_listener = config.the_session_listener();
+=======
+    context->display = config->the_display();
+    context->buffer_allocator = config->the_buffer_allocator();
+    context->surface_coordinator = config->the_surface_coordinator();
+    context->placement_strategy = config->the_shell_placement_strategy();
+    context->session_listener = config->the_shell_session_listener();
+>>>>>>> MERGE-SOURCE
     context->input_platform = mir::input::receiver::InputPlatform::create();
-    context->egl_client = config.the_graphics_platform()->create_internal_client();
+    context->egl_client = config->the_graphics_platform()->create_internal_client();
 }
 
-void ua_ui_mirserver_finish()
+void u_application_finish()
 {
     auto context = global_mirserver_context();
 

=== added directory 'src/ubuntu/desktop'
=== added file 'src/ubuntu/desktop/CMakeLists.txt'
--- src/ubuntu/desktop/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/ubuntu/desktop/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -0,0 +1,62 @@
+add_library(
+  ubuntu_application_api_desktop_mirclient MODULE
+
+  module_version.h
+)
+
+add_library(
+  ubuntu_application_api_desktop_mirserver MODULE
+
+  module_version.h
+)
+
+target_link_libraries(
+  ubuntu_application_api_desktop_mirclient
+
+  "-Wl,--whole-archive"
+  ubuntu_application_api_mirclient
+  ubuntu_application_api_mircommon
+  #TODO: ubuntu_application_api_d_sensors
+  ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
+  "-Wl,--no-whole-archive"
+  #TODO: Alarms
+)
+
+target_link_libraries(
+  ubuntu_application_api_desktop_mirserver
+
+  "-Wl,--whole-archive"
+  ubuntu_application_api_mirserver
+  ubuntu_application_api_mircommon
+  #TODO: ubuntu_application_api_d_sensors
+  ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
+  "-Wl,--no-whole-archive"
+  #TODO: Alarms
+)
+
+set_target_properties(
+  ubuntu_application_api_desktop_mirclient
+  PROPERTIES
+  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
+  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
+)
+
+set_target_properties(
+  ubuntu_application_api_desktop_mirserver
+  PROPERTIES
+  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
+  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
+)
+install(
+  TARGETS ubuntu_application_api_desktop_mirclient
+  # this is not a development library to compile against, users should always
+  # specify the SONAME; so don't build a *.so
+  LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
+)
+
+install(
+  TARGETS ubuntu_application_api_desktop_mirserver
+  # this is not a development library to compile against, users should always
+  # specify the SONAME; so don't build a *.so
+  LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
+)

=== added directory 'src/ubuntu/hardware'
=== modified file 'src/ubuntu/testbackend/ubuntu_application_sensors.cpp'
--- src/ubuntu/testbackend/ubuntu_application_sensors.cpp	2013-12-12 14:40:21 +0000
+++ src/ubuntu/testbackend/ubuntu_application_sensors.cpp	2014-05-02 12:23:55 +0000
@@ -375,22 +375,34 @@
     return static_cast<TestSensor*>(s)->min_delay;
 }
 
-float ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer* s) __SF_FN_ATTR;
-float ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer* s)
-{
-    return static_cast<TestSensor*>(s)->min_value;
-}
-
-float ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer* s) __SF_FN_ATTR;
-float ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer* s)
-{
-    return static_cast<TestSensor*>(s)->max_value;
-}
-
-float ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer* s) __SF_FN_ATTR;
-float ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer* s)
-{
-    return static_cast<TestSensor*>(s)->resolution;
+UStatus ua_sensors_accelerometer_get_min_value(UASensorsAccelerometer* s, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = static_cast<TestSensor*>(s)->min_value;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_accelerometer_get_max_value(UASensorsAccelerometer* s, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = static_cast<TestSensor*>(s)->max_value;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_accelerometer_get_resolution(UASensorsAccelerometer* s, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = static_cast<TestSensor*>(s)->resolution;
+
+    return U_STATUS_SUCCESS;
 }
 
 void ua_sensors_accelerometer_set_reading_cb(UASensorsAccelerometer* s, on_accelerometer_event_cb cb, void* ctx)
@@ -405,22 +417,34 @@
     return static_cast<TestSensor*>(e)->timestamp;
 }
 
-float uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent* e) __SF_FN_ATTR;
-float uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent* e)
-{
-    return static_cast<TestSensor*>(e)->x;
-}
-
-float uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent* e) __SF_FN_ATTR;
-float uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent* e)
-{
-    return static_cast<TestSensor*>(e)->y;
-}
-
-float uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent* e) __SF_FN_ATTR;
-float uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent* e)
-{
-    return static_cast<TestSensor*>(e)->z;
+UStatus uas_accelerometer_event_get_acceleration_x(UASAccelerometerEvent* e, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = static_cast<TestSensor*>(e)->x;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus uas_accelerometer_event_get_acceleration_y(UASAccelerometerEvent* e, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = static_cast<TestSensor*>(e)->y;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus uas_accelerometer_event_get_acceleration_z(UASAccelerometerEvent* e, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = static_cast<TestSensor*>(e)->z;
+
+    return U_STATUS_SUCCESS;
 }
 
 /***************************************
@@ -452,22 +476,34 @@
 }
 
 // the next three function make no sense in the API, just return zero
-float ua_sensors_proximity_get_min_value(UASensorsProximity*) __SF_FN_ATTR;
-float ua_sensors_proximity_get_min_value(UASensorsProximity*)
-{
-    return 0.0;
-}
-
-float ua_sensors_proximity_get_max_value(UASensorsProximity*) __SF_FN_ATTR;
-float ua_sensors_proximity_get_max_value(UASensorsProximity*)
-{
-    return 0.0;
-}
-
-float ua_sensors_proximity_get_resolution(UASensorsProximity*) __SF_FN_ATTR;
-float ua_sensors_proximity_get_resolution(UASensorsProximity*)
-{
-    return 0.0;
+UStatus ua_sensors_proximity_get_min_value(UASensorsProximity*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_proximity_get_max_value(UASensorsProximity*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_proximity_get_resolution(UASensorsProximity*, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = 0.f;
+
+    return U_STATUS_SUCCESS;
 }
 
 void ua_sensors_proximity_set_reading_cb(UASensorsProximity* s, on_proximity_event_cb cb, void* ctx)
@@ -516,22 +552,34 @@
     return static_cast<TestSensor*>(s)->min_delay;
 }
 
-float ua_sensors_light_get_min_value(UASensorsLight* s) __SF_FN_ATTR;
-float ua_sensors_light_get_min_value(UASensorsLight* s)
-{
-    return static_cast<TestSensor*>(s)->min_value;
-}
-
-float ua_sensors_light_get_max_value(UASensorsLight* s) __SF_FN_ATTR;
-float ua_sensors_light_get_max_value(UASensorsLight* s)
-{
-    return static_cast<TestSensor*>(s)->max_value;
-}
-
-float ua_sensors_light_get_resolution(UASensorsLight* s) __SF_FN_ATTR;
-float ua_sensors_light_get_resolution(UASensorsLight* s)
-{
-    return static_cast<TestSensor*>(s)->resolution;
+UStatus ua_sensors_light_get_min_value(UASensorsLight* s, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = static_cast<TestSensor*>(s)->min_value;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_light_get_max_value(UASensorsLight* s, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = static_cast<TestSensor*>(s)->max_value;
+
+    return U_STATUS_SUCCESS;
+}
+
+UStatus ua_sensors_light_get_resolution(UASensorsLight* s, float* value)
+{
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = static_cast<TestSensor*>(s)->resolution;
+
+    return U_STATUS_SUCCESS;
 }
 
 void ua_sensors_light_set_reading_cb(UASensorsLight* s, on_light_event_cb cb, void* ctx)
@@ -546,8 +594,12 @@
     return static_cast<TestSensor*>(e)->timestamp;
 }
 
-float uas_light_event_get_light(UASLightEvent* e) __SF_FN_ATTR;
-float uas_light_event_get_light(UASLightEvent* e)
+UStatus uas_light_event_get_light(UASLightEvent* e, float* value)
 {
-    return static_cast<TestSensor*>(e)->x;
+    if (!value)
+        return U_STATUS_ERROR;
+
+    *value = static_cast<TestSensor*>(e)->x;
+
+    return U_STATUS_SUCCESS;
 }

=== added directory 'src/ubuntu/touch'
=== added file 'src/ubuntu/touch/CMakeLists.txt'
--- src/ubuntu/touch/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/ubuntu/touch/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -0,0 +1,64 @@
+add_subdirectory(hybris)
+
+add_library(
+  ubuntu_application_api_touch_mirclient MODULE
+
+  module_version.h
+)
+
+add_library(
+  ubuntu_application_api_touch_mirserver MODULE
+
+  module_version.h
+)
+
+target_link_libraries(
+  ubuntu_application_api_touch_mirclient
+
+  "-Wl,--whole-archive"
+  ubuntu_application_api_mirclient
+  ubuntu_application_api_mircommon
+  ubuntu_application_api_hybris
+  ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
+  "-Wl,--no-whole-archive"
+  #TODO: Alarms
+)
+
+target_link_libraries(
+  ubuntu_application_api_touch_mirserver
+
+  "-Wl,--whole-archive"
+  ubuntu_application_api_mirserver
+  ubuntu_application_api_mircommon
+  ubuntu_application_api_hybris
+  ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}
+  "-Wl,--no-whole-archive"
+  #TODO: Alarms
+)
+
+set_target_properties(
+  ubuntu_application_api_touch_mirclient
+  PROPERTIES
+  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
+  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
+)
+
+set_target_properties(
+  ubuntu_application_api_touch_mirserver
+  PROPERTIES
+  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
+  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
+)
+install(
+  TARGETS ubuntu_application_api_touch_mirclient
+  # this is not a development library to compile against, users should always
+  # specify the SONAME; so don't build a *.so
+  LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
+)
+
+install(
+  TARGETS ubuntu_application_api_touch_mirserver
+  # this is not a development library to compile against, users should always
+  # specify the SONAME; so don't build a *.so
+  LIBRARY DESTINATION "${LIB_INSTALL_DIR}" NAMELINK_SKIP
+)

=== renamed directory 'src/ubuntu/hybris' => 'src/ubuntu/touch/hybris'
=== modified file 'src/ubuntu/touch/hybris/CMakeLists.txt'
--- src/ubuntu/hybris/CMakeLists.txt	2014-02-12 07:35:37 +0000
+++ src/ubuntu/touch/hybris/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -1,30 +1,27 @@
-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11")
+set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --std=c++11 -fPIC")
 
 add_library(
-  ubuntu_application_api SHARED
-
-  ubuntu_application_api_hybris.cpp
+  ubuntu_application_api_hybris STATIC
+  
+  #ubuntu_application_api_hybris.cpp
   ubuntu_application_sensors_hybris.cpp
 )
 
+include_directories(
+  ${CMAKE_BINARY_DIR}/include
+)
+
+target_link_libraries(
+  ubuntu_application_api_hybris
+  
+  ${Hybris}
+)
+
 add_library(
   ubuntu_platform_hardware_api SHARED
   ubuntu_platform_hardware_api.cpp
 )
 
-include_directories(
-  ${CMAKE_BINARY_DIR}/include
-)
-
-target_link_libraries(
-  ubuntu_application_api
-
-  "-Wl,--whole-archive"
-  ${UBUNTU_APPLICATION_API_LINK_LIBRARIES}  
-  "-Wl,--no-whole-archive"
-  ${Hybris}
-)
-
 target_link_libraries(
   ubuntu_platform_hardware_api
   dl
@@ -32,13 +29,6 @@
 )
 
 set_target_properties(
-  ubuntu_application_api
-  PROPERTIES
-  VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
-  SOVERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}
-)
-
-set_target_properties(
   ubuntu_platform_hardware_api
   PROPERTIES
   VERSION ${UBUNTU_PLATFORM_API_VERSION_MAJOR}.${UBUNTU_PLATFORM_API_VERSION_MINOR}.${UBUNTU_PLATFORM_API_VERSION_PATCH}
@@ -46,13 +36,8 @@
 )
 
 install(
-  TARGETS ubuntu_application_api  
-  ${INSTALL_TARGETS_DEFAULT_ARGS}
-)
-
-install(
   TARGETS ubuntu_platform_hardware_api
   ${INSTALL_TARGETS_DEFAULT_ARGS}
 )
 
-add_subdirectory(tests/)
+#add_subdirectory(tests/)

=== modified file 'src/ubuntu/touch/hybris/bridge.h'
--- src/ubuntu/hybris/bridge.h	2014-02-21 13:07:33 +0000
+++ src/ubuntu/touch/hybris/bridge.h	2014-05-02 12:23:55 +0000
@@ -53,7 +53,7 @@
         static const char* cache = NULL;
 
         if (cache == NULL) {
-            cache = secure_getenv("UBUNTU_PLATFORM_API_BACKEND");
+            cache = secure_getenv("UBUNTU_PLATFORM_API_SENSORS_BACKEND");
             if (cache == NULL)
                 cache = "/system/lib/libubuntu_application_api.so";
         }
@@ -143,22 +143,6 @@
         DLSYM(&f, #symbol);                     \
         return f(_1); }
 
-// pcs attribute (calling convention) is only defined on ARM, avoid warning on
-// other platforms
-#ifdef __arm__
-#define __SF_FN_ATTR __attribute__((pcs("aapcs")))
-#else
-#define __SF_FN_ATTR
-#endif
-
-#define IMPLEMENT_SF_FUNCTION1(return_type, symbol, arg1) \
-    return_type symbol(arg1 _1)                        \
-    {                                                  \
-        static return_type (*f)(arg1) __SF_FN_ATTR = NULL; \
-        DLSYM(&f, #symbol);                     \
-        return f(_1); }
-
-
 #define IMPLEMENT_VOID_FUNCTION1(symbol, arg1)               \
     void symbol(arg1 _1)                                     \
     {                                                        \

=== modified file 'src/ubuntu/touch/hybris/tests/CMakeLists.txt'
--- src/ubuntu/hybris/tests/CMakeLists.txt	2013-08-17 05:22:31 +0000
+++ src/ubuntu/touch/hybris/tests/CMakeLists.txt	2014-05-02 12:23:55 +0000
@@ -12,18 +12,18 @@
 add_executable(test_android_sensors_api test_sensors_api.cpp)
 target_link_libraries(test_android_sensors_api ubuntu_application_api)
 
-add_executable(test_android_ubuntu_session_api test_session_c_api.cpp)
-target_link_libraries(test_android_ubuntu_session_api ubuntu_application_api)
-
 add_executable(test_ubuntu_app_api_location_service test_location_api.cpp)
 target_link_libraries(test_ubuntu_app_api_location_service ubuntu_application_api)
 
+add_executable(test_hardware_alarms_api test_alarms_api.cpp)
+target_link_libraries(test_hardware_alarms_api ubuntu_platform_hardware_api)
+
 install(TARGETS
 	test_android_ubuntu_app_api
 	test_android_gps_api
 	test_android_ubuntu_app_api_multiple_surfaces
 	test_android_sensors_api
-	test_android_ubuntu_session_api
 	test_ubuntu_app_api_location_service
+	test_hardware_alarms_api
 	DESTINATION bin
 )

=== added file 'src/ubuntu/touch/hybris/tests/test_alarms_api.cpp'
--- src/ubuntu/touch/hybris/tests/test_alarms_api.cpp	1970-01-01 00:00:00 +0000
+++ src/ubuntu/touch/hybris/tests/test_alarms_api.cpp	2014-05-02 12:23:55 +0000
@@ -0,0 +1,62 @@
+/*
+ * Copyright © 2013 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 3 as
+ * published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Thomas Voß <thomas.voss@canonicalcom>
+ */
+
+#include <ubuntu/hardware/alarm.h>
+
+#include <cstdio>
+#include <ctime>
+
+int main(int argc, char** argv)
+{
+    UHardwareAlarm alarm = u_hardware_alarm_create();
+
+    if (!alarm)
+    {
+        printf("Error creating handle to hardware alarms.\n");
+        return 1;
+    }
+
+    // Alarm in two seconds.
+    timespec ts { 2, 0 };
+
+
+    UStatus rc = u_hardware_alarm_set_relative_to_with_behavior(
+        alarm,
+        U_HARDWARE_ALARM_TIME_REFERENCE_NOW,
+        U_HARDWARE_ALARM_SLEEP_BEHAVIOR_WAKEUP_DEVICE,
+        &ts);
+
+    if (rc != U_STATUS_SUCCESS)
+    {
+        printf("Problem setting hardware alarm.\n");
+        return 1;
+    }
+
+    UHardwareAlarmWaitResult wait_result;
+    rc = u_hardware_alarm_wait_for_next_alarm(alarm, &wait_result);
+
+    if (rc != U_STATUS_SUCCESS)
+    {
+        printf("Problem waiting for hardware alarm to go off.\n");
+        return 1;
+    }
+
+    printf("Successfully created and waited for a hw alarm.\n");
+
+    return 0;
+}

=== modified file 'src/ubuntu/touch/hybris/tests/test_sensors_api.cpp'
--- src/ubuntu/hybris/tests/test_sensors_api.cpp	2013-12-03 07:10:43 +0000
+++ src/ubuntu/touch/hybris/tests/test_sensors_api.cpp	2014-05-02 12:23:55 +0000
@@ -28,11 +28,15 @@
 
 void on_new_accelerometer_event(UASAccelerometerEvent* event, void* context)
 {
+    float x; uas_accelerometer_event_get_acceleration_x(event, &x);
+    float y; uas_accelerometer_event_get_acceleration_y(event, &y);
+    float z; uas_accelerometer_event_get_acceleration_z(event, &z);
+
     printf("%s \n", __PRETTY_FUNCTION__);
     printf("\ttime: %" PRIu64 "\n", uas_accelerometer_event_get_timestamp(event));
-    printf("\tx: %f\n", uas_accelerometer_event_get_acceleration_x(event));
-    printf("\ty: %f\n", uas_accelerometer_event_get_acceleration_y(event));
-    printf("\tz: %f\n", uas_accelerometer_event_get_acceleration_z(event));
+    printf("\tx: %f\n", x);
+    printf("\ty: %f\n", y);
+    printf("\tz: %f\n", z);
 }
 
 void on_new_proximity_event(UASProximityEvent* event, void* context)
@@ -57,9 +61,11 @@
 
 void on_new_light_event(UASLightEvent* event, void* context)
 {
+    float light = -1.f; uas_light_event_get_light(event, &light);
+
     printf("%s \n", __PRETTY_FUNCTION__);
     printf("\ttime: %" PRIu64 "\n", uas_light_event_get_timestamp(event));
-    printf("\tlight: %f\n", uas_light_event_get_light(event));
+    printf("\tlight: %f\n", light);
 }
 
 int main(int argc, char** argv)

=== modified file 'src/ubuntu/touch/hybris/ubuntu_application_sensors_hybris.cpp'
--- src/ubuntu/hybris/ubuntu_application_sensors_hybris.cpp	2014-02-05 09:26:23 +0000
+++ src/ubuntu/touch/hybris/ubuntu_application_sensors_hybris.cpp	2014-05-02 12:23:55 +0000
@@ -30,25 +30,25 @@
 IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_enable, UASensorsAccelerometer*);
 IMPLEMENT_FUNCTION1(UStatus, ua_sensors_accelerometer_disable, UASensorsAccelerometer*);
 IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_accelerometer_get_min_delay, UASensorsAccelerometer*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_min_value, UASensorsAccelerometer*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_max_value, UASensorsAccelerometer*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_accelerometer_get_resolution, UASensorsAccelerometer*);
+IMPLEMENT_FUNCTION2(UStatus, ua_sensors_accelerometer_get_min_value, UASensorsAccelerometer*, float*);
+IMPLEMENT_FUNCTION2(UStatus, ua_sensors_accelerometer_get_max_value, UASensorsAccelerometer*, float*);
+IMPLEMENT_FUNCTION2(UStatus, ua_sensors_accelerometer_get_resolution, UASensorsAccelerometer*, float*);
 IMPLEMENT_VOID_FUNCTION3(ua_sensors_accelerometer_set_reading_cb, UASensorsAccelerometer*, on_accelerometer_event_cb, void*);
 
 // Acceleration Sensor Event
 IMPLEMENT_FUNCTION1(uint64_t, uas_accelerometer_event_get_timestamp, UASAccelerometerEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_x, UASAccelerometerEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_y, UASAccelerometerEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_accelerometer_event_get_acceleration_z, UASAccelerometerEvent*);
+IMPLEMENT_FUNCTION2(UStatus, uas_accelerometer_event_get_acceleration_x, UASAccelerometerEvent*, float*);
+IMPLEMENT_FUNCTION2(UStatus, uas_accelerometer_event_get_acceleration_y, UASAccelerometerEvent*, float*);
+IMPLEMENT_FUNCTION2(UStatus, uas_accelerometer_event_get_acceleration_z, UASAccelerometerEvent*, float*);
 
 // Proximity Sensor
 IMPLEMENT_CTOR0(UASensorsProximity*, ua_sensors_proximity_new);
 IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_enable, UASensorsProximity*);
 IMPLEMENT_FUNCTION1(UStatus, ua_sensors_proximity_disable, UASensorsProximity*);
 IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_proximity_get_min_delay, UASensorsProximity*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_min_value, UASensorsProximity*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_max_value, UASensorsProximity*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_proximity_get_resolution, UASensorsProximity*);
+IMPLEMENT_FUNCTION2(UStatus, ua_sensors_proximity_get_min_value, UASensorsProximity*, float*);
+IMPLEMENT_FUNCTION2(UStatus, ua_sensors_proximity_get_max_value, UASensorsProximity*, float*);
+IMPLEMENT_FUNCTION2(UStatus, ua_sensors_proximity_get_resolution, UASensorsProximity*, float*);
 IMPLEMENT_VOID_FUNCTION3(ua_sensors_proximity_set_reading_cb, UASensorsProximity*, on_proximity_event_cb, void*);
 
 // Proximity Sensor Event
@@ -60,11 +60,11 @@
 IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_enable, UASensorsLight*);
 IMPLEMENT_FUNCTION1(UStatus, ua_sensors_light_disable, UASensorsLight*);
 IMPLEMENT_FUNCTION1(uint32_t, ua_sensors_light_get_min_delay, UASensorsLight*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_min_value, UASensorsLight*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_max_value, UASensorsLight*);
-IMPLEMENT_SF_FUNCTION1(float, ua_sensors_light_get_resolution, UASensorsLight*);
+IMPLEMENT_FUNCTION2(UStatus, ua_sensors_light_get_min_value, UASensorsLight*, float*);
+IMPLEMENT_FUNCTION2(UStatus, ua_sensors_light_get_max_value, UASensorsLight*, float*);
+IMPLEMENT_FUNCTION2(UStatus, ua_sensors_light_get_resolution, UASensorsLight*, float*);
 IMPLEMENT_VOID_FUNCTION3(ua_sensors_light_set_reading_cb, UASensorsLight*, on_light_event_cb, void*);
 
 // Ambient Light Sensor Event
 IMPLEMENT_FUNCTION1(uint64_t, uas_light_event_get_timestamp, UASLightEvent*);
-IMPLEMENT_SF_FUNCTION1(float, uas_light_event_get_light, UASLightEvent*);
+IMPLEMENT_FUNCTION2(UStatus, uas_light_event_get_light, UASLightEvent*, float*);

=== modified file 'src/ubuntu/touch/hybris/ubuntu_platform_hardware_api.cpp'
--- src/ubuntu/hybris/ubuntu_platform_hardware_api.cpp	2013-06-13 08:37:52 +0000
+++ src/ubuntu/touch/hybris/ubuntu_platform_hardware_api.cpp	2014-05-02 12:23:55 +0000
@@ -18,6 +18,7 @@
  */
 
 // C APIs
+#include <ubuntu/hardware/alarm.h>
 #include <ubuntu/hardware/gps.h>
 
 #include "bridge.h"
@@ -76,3 +77,37 @@
 UHardwareGps, 
 char*, 
 int);
+
+/****************** HW ALARMS API ******************/
+
+IMPLEMENT_CTOR0(
+        UHardwareAlarm,
+        u_hardware_alarm_create);
+
+IMPLEMENT_VOID_FUNCTION1(
+        u_hardware_alarm_ref,
+        UHardwareAlarm);
+
+IMPLEMENT_VOID_FUNCTION1(
+        u_hardware_alarm_unref,
+        UHardwareAlarm);
+
+IMPLEMENT_FUNCTION2(
+        UStatus,
+        u_hardware_alarm_set_timezone,
+        UHardwareAlarm,
+        const struct timezone*);
+
+IMPLEMENT_FUNCTION4(
+        UStatus,
+        u_hardware_alarm_set_relative_to_with_behavior,
+        UHardwareAlarm,
+        UHardwareAlarmTimeReference,
+        UHardwareAlarmSleepBehavior,
+        const struct timespec*);
+
+IMPLEMENT_FUNCTION2(
+        UStatus,
+        u_hardware_alarm_wait_for_next_alarm,
+        UHardwareAlarm,
+        UHardwareAlarmWaitResult*);

=== modified file 'tests/test_ubuntu_application_sensors.cpp'
--- tests/test_ubuntu_application_sensors.cpp	2014-02-07 12:24:32 +0000
+++ tests/test_ubuntu_application_sensors.cpp	2014-05-02 12:23:55 +0000
@@ -65,7 +65,7 @@
             abort();
         }
         setenv("UBUNTU_PLATFORM_API_SENSOR_TEST", data_file, 1);
-        setenv("UBUNTU_PLATFORM_API_BACKEND", "libubuntu_application_api_test.so.1", 1);
+        setenv("UBUNTU_PLATFORM_API_SENSORS_BACKEND", "libubuntu_application_api_test.so.1", 1);
 
         // ensure the queue is clear
         while (events.size() > 0)
@@ -110,9 +110,14 @@
 
     UASensorsAccelerometer *s = ua_sensors_accelerometer_new();
     EXPECT_TRUE(s != NULL);
-    EXPECT_FLOAT_EQ(0.5, ua_sensors_accelerometer_get_min_value(s));
-    EXPECT_FLOAT_EQ(1000.0, ua_sensors_accelerometer_get_max_value(s));
-    EXPECT_FLOAT_EQ(0.1, ua_sensors_accelerometer_get_resolution(s));
+
+    float min = 0.f; ua_sensors_accelerometer_get_min_value(s, &min);
+    float max = 0.f; ua_sensors_accelerometer_get_max_value(s, &max);
+    float res = 0.f; ua_sensors_accelerometer_get_resolution(s, &res);
+
+    EXPECT_FLOAT_EQ(0.5, min);
+    EXPECT_FLOAT_EQ(1000.0, max);
+    EXPECT_FLOAT_EQ(0.1, res);
 })
 
 TESTP_F(SimBackendTest, CreateLight, {
@@ -122,9 +127,14 @@
 
     UASensorsLight *s = ua_sensors_light_new();
     EXPECT_TRUE(s != NULL);
-    EXPECT_FLOAT_EQ(0.0, ua_sensors_light_get_min_value(s));
-    EXPECT_FLOAT_EQ(10.0, ua_sensors_light_get_max_value(s));
-    EXPECT_FLOAT_EQ(0.5, ua_sensors_light_get_resolution(s));
+
+    float min = 0.f; ua_sensors_light_get_min_value(s, &min);
+    float max = 0.f; ua_sensors_light_get_max_value(s, &max);
+    float res = 0.f; ua_sensors_light_get_resolution(s, &res);
+
+    EXPECT_FLOAT_EQ(0.0, min);
+    EXPECT_FLOAT_EQ(10.0, max);
+    EXPECT_FLOAT_EQ(0.5, res);
 })
 
 TESTP_F(SimBackendTest, ProximityEvents, {
@@ -191,8 +201,10 @@
 
     ua_sensors_light_set_reading_cb(s,
         [](UASLightEvent* ev, void* ctx) {
+            float light = -1.f;
+             uas_light_event_get_light(ev, &light);
             events.push({uas_light_event_get_timestamp(ev),
-                         uas_light_event_get_light(ev), .0, .0,
+                         light, .0, .0,
                          (UASProximityDistance) 0, ctx});
         }, NULL);
 
@@ -229,10 +241,14 @@
 
     ua_sensors_accelerometer_set_reading_cb(s,
         [](UASAccelerometerEvent* ev, void* ctx) {
+            float x; uas_accelerometer_event_get_acceleration_x(ev, &x);
+            float y; uas_accelerometer_event_get_acceleration_y(ev, &y);
+            float z; uas_accelerometer_event_get_acceleration_z(ev, &z);
+
             events.push({uas_accelerometer_event_get_timestamp(ev),
-                         uas_accelerometer_event_get_acceleration_x(ev),
-                         uas_accelerometer_event_get_acceleration_y(ev),
-                         uas_accelerometer_event_get_acceleration_z(ev),
+                         x,
+                         y,
+                         z,
                          (UASProximityDistance) 0, ctx});
         }, NULL);
 
@@ -274,8 +290,12 @@
         // calling its functions should not crash; we can't assert much about
         // their actual values, though
         ua_sensors_proximity_enable(s);
-        EXPECT_LE(ua_sensors_proximity_get_min_value(s), ua_sensors_proximity_get_max_value(s));
-        ua_sensors_proximity_get_resolution(s);
+        float min; ua_sensors_proximity_get_min_value(s, &min);
+        float max; ua_sensors_proximity_get_max_value(s, &max);
+
+        EXPECT_LE(min, max);
+
+        float res; ua_sensors_proximity_get_resolution(s, &res);
         ua_sensors_proximity_disable(s);
     } else {
         cerr << "no proximity sensor on this hardware\n";
@@ -291,8 +311,12 @@
         // calling its functions should not crash; we can't assert much about
         // their actual values, though
         ua_sensors_accelerometer_enable(s);
-        EXPECT_LE(ua_sensors_accelerometer_get_min_value(s), ua_sensors_accelerometer_get_max_value(s));
-        ua_sensors_accelerometer_get_resolution(s);
+        float min; ua_sensors_accelerometer_get_min_value(s, &min);
+        float max; ua_sensors_accelerometer_get_max_value(s, &max);
+
+        EXPECT_LE(min, max);
+
+        float res; ua_sensors_accelerometer_get_resolution(s, &res);
         ua_sensors_accelerometer_disable(s);
     } else {
         cerr << "no accelerometer sensor on this hardware\n";
@@ -308,8 +332,12 @@
         // calling its functions should not crash; we can't assert much about
         // their actual values, though
         ua_sensors_light_enable(s);
-        EXPECT_LE(ua_sensors_light_get_min_value(s), ua_sensors_light_get_max_value(s));
-        ua_sensors_light_get_resolution(s);
+        float min; ua_sensors_light_get_min_value(s, &min);
+        float max; ua_sensors_light_get_max_value(s, &max);
+
+        EXPECT_LE(min, max);
+
+        float res; ua_sensors_light_get_resolution(s, &res);
         ua_sensors_light_disable(s);
     } else {
         cerr << "no light sensor on this hardware\n";