Compare commits

...

41 Commits

Author SHA1 Message Date
Simo Piiroinen
6ca93012d5 Bump mce-dev version to 1.21.0 2017-01-23 11:59:57 +02:00
spiiroin
accc1f4bde Merge branch 'jb37422_expose_battery_data' into 'master'
Expose battery/charging data on D-Bus

See merge request !3
2017-01-23 09:57:18 +00:00
Simo Piiroinen
efb7efd024 [mce] Expose battery/charging data on D-Bus. Contributes to JB#37422
Add names of D-Bus method calls and signals related to querying and
tracking of battery/charging related information.

Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
2017-01-20 12:02:04 +02:00
Simo Piiroinen
780ae8245b Bump mce-dev version to 1.20.0 2016-11-10 08:53:37 +02:00
Simo Piiroinen
5a8d06c02e [build] Allow OBS builds without explicit version tag
The mce-dev version information is recorded in several files. To keep
these in sync, there is a script that will cause rpm builds to fail unless
all of the places have the same version.

While this is good for making sure releases do not end up using out of
sync version numbers, it also makes it impossible to do builds in OBS
without creating explicit version tag.

The same way as mce itself already does, relax the version checking for
spec file so that versions constructed from matching version + extra git
hash identification are also accepted.
2016-11-10 08:53:12 +02:00
spiiroin
22a9feb64e Merge branch 'jb34813_get_all_settings' into 'master'
Add method call for getting all mce settings



See merge request !2
2016-11-10 06:25:51 +00:00
Simo Piiroinen
5ea1f28ad7 [mce] Add method call for getting all mce settings. JB#34813 2016-11-09 14:02:43 +02:00
Simo Piiroinen
13e1c2b3c0 Bump mce-dev version to 1.19.0 2016-05-04 12:56:55 +03:00
spiiroin
34edc46e9e Merge branch 'jb20728_blank_ignored_call' into 'master'
Add D-Bus method for ignoring incoming call



See merge request !1
2016-05-04 09:53:47 +00:00
Simo Piiroinen
358243f960 [powerkey] Add method for ignoring incoming call. JB#20728 2016-04-12 14:31:19 +03:00
Simo Piiroinen
e6e96ef67f Bump mce-dev version to 1.18.0 2015-09-14 11:45:58 +03:00
Simo Piiroinen
002e5fd865 Merge pull request #11 from kimmoli/powerkeytriggers
Add constants for powerkey events
2015-09-14 11:43:42 +03:00
Kimmo Lindholm
62d5ea325f [powerkey] Add constants for powerkey events. Fixes MER#1310
New constants
 * MCE_POWERKEY_EVENT_SHORT_PRESS
 * MCE_POWERKEY_EVENT_LONG_PRESS
 * MCE_POWERKEY_EVENT_DOUBLE_PRESS
2015-09-13 21:03:22 +03:00
Simo Piiroinen
22e05c7993 Bump mce-dev version to 1.17.0 2015-06-18 12:29:39 +03:00
Simo Piiroinen
762d2b5bea Merge pull request #10 from spiiroin/jb29675_expose_blanking_policy
Add D-Bus constants for exposing display blanking policy
2015-06-18 12:27:29 +03:00
Simo Piiroinen
be82c4e57a Add D-Bus constants for exposing display blanking policy
New method call:
* get_display_blanking_policy

New signal:
* display_blanking_policy_ind

[mce] Add D-Bus constants for exposing display blanking policy. Contributes to JB#29675
2015-06-18 12:25:37 +03:00
Simo Piiroinen
3955a9dbbe Bump mce-dev version to 1.16.1 2015-05-27 08:11:20 +03:00
Simo Piiroinen
76b89ce87e Merge pull request #9 from spiiroin/jb28938_remove_yaml
Remove old spectacle cruft
2015-05-27 08:09:11 +03:00
Simo Piiroinen
95ff9e77f0 Remove rpm build time patch for file ownership
The Makefile explicitly assigns file ownership to root. There is a rpm
build time patch to change this while it should not be needed even for
the debian builds.

Apply the patch to code tree and remove the patch file.

[packaging] Remove rpm build time patch for file ownership
2015-05-21 09:24:51 +03:00
Simo Piiroinen
64822062d2 Remove old spectacle cruft
We don't use spectacle anymore.

Remove the yaml-file and associated cruft.

[packaging] Remove old spectacle cruft. Fixes JB#28938
2015-05-21 09:06:05 +03:00
Simo Piiroinen
38cc9dd67d Bump mce-dev version to 1.16.0 2015-05-20 12:56:13 +03:00
Simo Piiroinen
f4b17e4266 Merge pull request #8 from spiiroin/jb28929_blanking_pause_signal
Add D-Bus constants for exposing blanking pause and inhibit states
2015-05-20 12:53:31 +03:00
Simo Piiroinen
0d161d6b95 Add D-Bus constants for exposing blanking pause and inhibit states
New method calls:
* get_display_blanking_pause
* get_display_blanking_inhibit

New signals:
* display_blanking_pause_ind
* display_blanking_inhibit_ind

[mce] Add D-Bus constants for exposing blanking pause and inhibit states. Contributes to JB#28929
2015-05-20 12:40:50 +03:00
Simo Piiroinen
f4e89b99c2 Bump mce-dev version to 1.15.0 2015-02-17 10:44:15 +02:00
Simo Piiroinen
8a2f0096ae Merge pull request #7 from spiiroin/jb24286_config_reset
Add dbus method for requesting settings reset
2015-02-17 10:42:05 +02:00
Simo Piiroinen
bffba82ed6 Add dbus method for requesting settings reset
Allows resetting mce settings back to defaults without needing to
know what the defaults are and/or stopping mce service.

[mce] Add dbus method for requesting settings reset. Contributes to JB#24286
2015-02-17 10:33:28 +02:00
Simo Piiroinen
c71040dcd1 Bump mce-dev version to 1.14.0 2014-08-05 12:57:37 +03:00
Simo Piiroinen
348ebf4525 Merge pull request #6 from spiiroin/add_lpm_request
Add dbus method for requesting display low power mode
2014-08-05 12:53:30 +03:00
Simo Piiroinen
58b5ee55a6 Add dbus method for requesting display low power mode
Allows ui components to have an option to blank via low power mode
instead of just powering off the display.

[mce] Add dbus method for requesting display low power mode. Contributes to JB#20906
2014-06-26 08:38:57 +03:00
Simo Piiroinen
489e489c88 Bump mce-dev version to 1.13.0 2014-03-18 15:06:10 +02:00
Simo Piiroinen
42e930998c Merge pull request #5 from spiiroin/add_led_pattern_signals
Add led pattern signals
2014-03-18 14:59:17 +02:00
Simo Piiroinen
fa2b8aa3a8 Document tracking id parameter for cpu keepalive method calls
The support for the tracking id parameter was added to mce 1.23.7,
but the documentation was not updated accordingly.

[mce-headers] Document tracking id parameter for cpu keepalive method calls
2014-03-18 14:50:11 +02:00
Simo Piiroinen
ff899e3917 Add D-Bus signals for led pattern active state changes
Emitted when pattern is activated/deactivated within mce.

[mce-headers] Add D-Bus signals for led pattern active state changes
2014-03-18 14:47:13 +02:00
Simo Piiroinen
b3de512237 Bump mce-dev version to 1.12.5 2013-09-11 08:28:04 +03:00
Simo Piiroinen
ac94c56b38 Merge pull request #4 from spiiroin/fix_doc
Fix MCE_CPU_KEEPALIVE_PERIOD_REQ method call documentation
2013-09-10 22:24:41 -07:00
Simo Piiroinen
f813e5dd80 Fix MCE_CPU_KEEPALIVE_PERIOD_REQ method call documentation
The value returned is dbus_int32_t, not dbus_uint32_t. Documentation
changed to match implementation.

[mce-headers] Fix MCE_CPU_KEEPALIVE_PERIOD_REQ method call documentation
2013-09-11 08:16:13 +03:00
Simo Piiroinen
9ad0a5ec3e Bump mce-dev version to 1.12.4 2013-09-04 13:31:33 +03:00
Simo Piiroinen
63a93af0ab Add script to check various files that hold package version
Helps to remember all the places that need to be modified
before releasing a new version.
2013-09-04 13:30:37 +03:00
Simo Piiroinen
06d00f21eb Merge pull request #3 from spiiroin/config_api
Add configuration value methods and signals
2013-09-04 02:58:30 -07:00
Simo Piiroinen
eb5cc785f2 Add configuration value methods and signals
New methods: MCE_CONFIG_GET and MCE_CONFIG_SET
New signals: MCE_CONFIG_CHANGE_SIG

[mce-headers] Configuration value methods and signals added
2013-09-04 09:24:45 +03:00
Islam Amer
736c7bea93 [packaging] move to git based packaging 2013-05-18 14:20:28 +03:00
8 changed files with 594 additions and 7 deletions

View File

@@ -6,7 +6,7 @@
# Modified by: Ilya Dogolazky, Tuomo Tanskanen
INSTALL_DIR := install -d
INSTALL_DATA := install -o root -g root --mode=644
INSTALL_DATA := install --mode=644
DOXYGEN := doxygen

79
debian/changelog vendored
View File

@@ -1,3 +1,82 @@
mce-dev (1.21.0) unstable; urgency=low
* [mce] Expose battery/charging data on D-Bus. Contributes to JB#37422
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Mon, 23 Jan 2017 11:58:37 +0200
mce-dev (1.20.0) unstable; urgency=low
* [mce] Add method call for getting all mce settings. JB#34813
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Thu, 10 Nov 2016 08:27:14 +0200
mce-dev (1.19.0) unstable; urgency=low
* [powerkey] Add method for ignoring incoming call. JB#20728
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Wed, 04 May 2016 12:54:34 +0300
mce-dev (1.18.0) unstable; urgency=low
* [powerkey] Add constants for powerkey events. Fixes MER#1310
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Mon, 14 Sep 2015 11:44:27 +0300
mce-dev (1.17.0) unstable; urgency=low
* [mce] Add D-Bus constants for exposing display blanking policy.
Contributes to JB#29675
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Thu, 18 Jun 2015 12:28:10 +0300
mce-dev (1.16.1) unstable; urgency=low
* [packaging] Remove old spectacle cruft. Fixes JB#28938
* [packaging] Remove rpm build time patch for file ownership
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Wed, 27 May 2015 08:09:56 +0300
mce-dev (1.16.0) unstable; urgency=low
* [mce] Add D-Bus constants for exposing blanking pause and inhibit
states. Contributes to JB#28929
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Wed, 20 May 2015 12:54:50 +0300
mce-dev (1.15.0) unstable; urgency=low
* [mce] Add dbus method for requesting settings reset. Contributes to
JB#24286
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Tue, 17 Feb 2015 10:42:49 +0200
mce-dev (1.14.0) unstable; urgency=low
* [mce] Add dbus method for requesting display low power mode.
Contributes to JB#20906
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Tue, 05 Aug 2014 12:55:05 +0300
mce-dev (1.13.0) unstable; urgency=low
* [mce-headers] Add D-Bus signals for led pattern active state changes
* [mce-headers] Document tracking id parameter for cpu keepalive method calls
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Tue, 18 Mar 2014 15:00:14 +0200
mce-dev (1.12.5) unstable; urgency=low
* [mce-headers] Fix MCE_CPU_KEEPALIVE_PERIOD_REQ method call documentation
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Wed, 11 Sep 2013 08:26:03 +0300
mce-dev (1.12.4) unstable; urgency=low
* [packaging] move to git based packaging
* [mce-headers] Configuration value methods and signals added
-- Simo Piiroinen <simo.piiroinen@jollamobile.com> Wed, 04 Sep 2013 13:23:08 +0300
mce-dev (1.12.3) unstable; urgency=low
* Added cpu-keepalive methods

View File

@@ -241,6 +241,19 @@
*/
#define MCE_CALL_STATE_CHANGE_REQ "req_call_state_change"
/** Inform mce that incoming call has been ignored by ui
*
* When there is an incoming call, mce reserves the power key
* for silencing the ringing tone.
*
* This method can be used by the call ui to inform mce that the
* call has been ignored and power key can be used for display
* power control even though there are calls in ringing state.
*
* @since v1.19.0
*/
#define MCE_IGNORE_INCOMING_CALL_REQ "req_ignore_incoming_call"
/**
* Unblank display
*
@@ -262,6 +275,18 @@
*/
#define MCE_DISPLAY_OFF_REQ "req_display_state_off"
/** Set display to low power mode
*
* Low power mode is a display off sub state. From normal
* display state signaling point of view it behaves just as
* display off would. Depending on available hw support and
* configuration extra ipc relevant for home screen / system
* ui only might happen.
*
* @since v1.33.0
*/
#define MCE_DISPLAY_LPM_REQ "req_display_state_lpm"
/**
* Prevent display from blanking
*
@@ -276,6 +301,33 @@
*/
#define MCE_CANCEL_PREVENT_BLANK_REQ "req_display_cancel_blanking_pause"
/** Get current blank prevention status
*
* @since 1.51.0
*
* @return @c gchar @c * with the blanking pause state
* (see @ref mce/mode-names.h for valid blanking pause states)
*/
#define MCE_PREVENT_BLANK_GET "get_display_blanking_pause"
/** Get current blank inhibition status
*
* @since 1.51.0
*
* @return @c gchar @c * with the blanking inhibit state
* (see @ref mce/mode-names.h for valid blanking inhibit states)
*/
#define MCE_BLANKING_INHIBIT_GET "get_display_blanking_inhibit"
/** Get current display blanking policy status
*
* @since v1.55.0
*
* @return @c gchar @c * with the blanking polic state
* (see @ref mce/mode-names.h for valid blanking policy states)
*/
#define MCE_BLANKING_POLICY_GET "get_display_blanking_policy"
/**
* Request CABC mode change
*
@@ -306,10 +358,8 @@
* trigger; @c FALSE == short powerkey press,
* @c TRUE == long powerkey press
* @since v1.10.54
* @param type @c dbus_uint32_t with the type of powerkey event to
* trigger; @c 0 == short powerkey press,
* @c 1 == long powerkey press,
* @c 2 == double powerkey press
* @param type @c dbus_uint32_t with the type of powerkey event to trigger
* (see @ref mce/mode-names.h for valid events)
*/
#define MCE_TRIGGER_POWERKEY_EVENT_REQ "req_trigger_powerkey_event"
@@ -346,7 +396,20 @@
*
* @since v1.12.8
*
* @return period in seconds as DBUS_TYPE_UINT32
* @since v1.23.7
*
* An unique within process tracking id can be passed to all
* cpu keepalive related D-Bus method calls. This allows mce
* to keep track of multiple, possibly overlapping keepalive
* periods from one process.
*
* Old code that does not pass the tracking id still works
* as long as the client process does not have multiple
* overlapping periods at once.
*
* @param context Tracking id as DBUS_TYPE_STRING
*
* @return period in seconds as DBUS_TYPE_INT32
*/
#define MCE_CPU_KEEPALIVE_PERIOD_REQ "req_cpu_keepalive_period"
@@ -362,6 +425,8 @@
*
* @since v1.12.8
*
* @param context Tracking id as DBUS_TYPE_STRING
*
* @return success as DBUS_TYPE_BOOLEAN
*/
#define MCE_CPU_KEEPALIVE_START_REQ "req_cpu_keepalive_start"
@@ -377,6 +442,8 @@
*
* @since v1.12.8
*
* @param context Tracking id as DBUS_TYPE_STRING
*
* @return success as DBUS_TYPE_BOOLEAN
*/
#define MCE_CPU_KEEPALIVE_STOP_REQ "req_cpu_keepalive_stop"
@@ -396,6 +463,105 @@
*/
#define MCE_CPU_KEEPALIVE_WAKEUP_REQ "req_cpu_keepalive_wakeup"
/** Query configuration value
*
* @since v1.12.15
*
* @param key Configuration value name as DBUS_TYPE_STRING
*
* @return Configuration value as DBUS_TYPE_VARIANT, or
* error reply
*/
#define MCE_CONFIG_GET "get_config"
/** Query all configuration values
*
* Get array of (key,value) pairs for all runtime changeable settings
* that mce supports.
*
* @since v1.83.0
*
* @return ARRAY(DICT_ENTRY(STRING, VARIANT)), or
* error reply
*/
#define MCE_CONFIG_GET_ALL "get_config_all"
/** Set configuration value
*
* @since v1.12.15
*
* @param key Configuration value name as DBUS_TYPE_STRING
* @param val Configuration value as DBUS_TYPE_VARIANT
*
* @return Success as DBUS_TYPE_BOOLEAN, or error reply
*/
#define MCE_CONFIG_SET "set_config"
/** Reset configuration values to default
*
* All config settings with keyname that matches the given substring
* will be reset to configured defaults e.g. using "/" resets all
* settings while using "/display/" resets only display related values.
*
* @since v1.42.0
*
* @param keyish Substring of config value name as DBUS_TYPE_STRING
*
* @return Number of changed settings as DBUS_TYPE_INT32; -1 on failure
*/
#define MCE_CONFIG_RESET "reset_config"
/** Query current USB cable state
*
* Possible return values are:
* - #MCE_USB_CABLE_STATE_UNKNOWN
* - #MCE_USB_CABLE_STATE_CONNECTED
* - #MCE_USB_CABLE_STATE_DISCONNECTED
*
* @since v1.86.0
*
* @return USB cable connection state as DBUS_TYPE_STRING
*/
#define MCE_USB_CABLE_STATE_GET "get_usb_cable_state"
/** Query current charger state
*
* Possible return values are:
* - #MCE_CHARGER_STATE_UNKNOWN
* - #MCE_CHARGER_STATE_ON
* - #MCE_CHARGER_STATE_OFF
*
* @since v1.86.0
*
* @return charger state as DBUS_TYPE_STRING
*/
#define MCE_CHARGER_STATE_GET "get_charger_state"
/** Query current battery status
*
* Possible return values are:
* - #MCE_BATTERY_STATUS_UNKNOWN
* - #MCE_BATTERY_STATUS_FULL
* - #MCE_BATTERY_STATUS_OK
* - #MCE_BATTERY_STATUS_LOW
* - #MCE_BATTERY_STATUS_EMPTY
*
* @since v1.86.0
*
* @return battery status as DBUS_TYPE_STRING
*/
#define MCE_BATTERY_STATUS_GET "get_battery_status"
/** Query current battery level
*
* Return value is in range from 0 to 100 percent,
* or #MCE_BATTERY_LEVEL_UNKNOWN
*
* @since v1.86.0
*
* @return battery level as DBUS_TYPE_INT32
*/
#define MCE_BATTERY_LEVEL_GET "get_battery_level"
/*@}*/
/**
@@ -422,6 +588,33 @@
*/
#define MCE_DISPLAY_SIG "display_status_ind"
/** Notify everyone whether the display blanking is paused
*
* @since v1.51.0
*
* @return @c gchar @c * with the blanking pause state
* (see @ref mce/mode-names.h for valid blanking pause states)
*/
#define MCE_PREVENT_BLANK_SIG "display_blanking_pause_ind"
/** Notify everyone whether the display blanking is inhibited
*
* @since v1.51.0
*
* @return @c gchar @c * with the display baling inhibit state
* (see @ref mce/mode-names.h for valid blanking inhibit states)
*/
#define MCE_BLANKING_INHIBIT_SIG "display_blanking_inhibit_ind"
/** Notify everyone when the display blanking policy changes
*
* @since v1.55.0
*
* @return @c gchar @c * with the display blankiing policy state
* (see @ref mce/mode-names.h for valid blanking policy states)
*/
#define MCE_BLANKING_POLICY_SIG "display_blanking_policy_ind"
/**
* Notify everyone that the state of the automatic power saving mode changed
*
@@ -468,6 +661,56 @@
*/
#define MCE_CALL_STATE_SIG "sig_call_state_ind"
/** Notify everyone that mce configuration value has changed
*
* @since v1.14.1
*
* @param key Config value name as DBUS_TYPE_STRING
* @param val Config value as DBUS_TYPE_VARIANT
*/
#define MCE_CONFIG_CHANGE_SIG "config_change_ind"
/** Signal that indicates that USB cable state has changed
*
* Possible arguments values are:
* See #MCE_USB_CABLE_STATE_GET for possible argument values
*
* @since v1.86.0
*
* @param cable_state USB cable connection state as DBUS_TYPE_STRING
*/
#define MCE_USB_CABLE_STATE_SIG "usb_cable_state_ind"
/** Signal that indicates that charger state has changed
*
* See #MCE_CHARGER_STATE_GET for possible argument values
*
* @since v1.86.0
*
* @param charger_state charger state as DBUS_TYPE_STRING
*/
#define MCE_CHARGER_STATE_SIG "charger_state_ind"
/** Signal that indicates that battery status has changed
*
* See #MCE_BATTERY_STATUS_GET for possible argument values
*
* @since v1.86.0
*
* @param battery_status battery status as DBUS_TYPE_STRING
*/
#define MCE_BATTERY_STATUS_SIG "battery_status_ind"
/** Signal that indicates that battery level has changed
*
* See #MCE_BATTERY_LEVEL_GET for possible argument values
*
* @since v1.86.0
*
* @param battery_level battery level as DBUS_TYPE_INT32
*/
#define MCE_BATTERY_LEVEL_SIG "battery_level_ind"
/*@}*/
/**
@@ -478,8 +721,11 @@
/**
* Activates a pre-defined LED pattern
*
* Non-existing patterns are ignored
*
* See also: MCE_LED_PATTERN_ACTIVATED_SIG
*
* @credential mce::LEDControl
* @since v1.5.0
* @param pattern @c gchar @c * with the pattern name
@@ -489,8 +735,11 @@
/**
* Deactivates a pre-defined LED pattern
*
* Non-existing patterns are ignored
*
* See also: MCE_LED_PATTERN_DEACTIVATED_SIG
*
* @credential mce::LEDControl
* @since v1.5.0
* @param pattern @c gchar @c * with the pattern name
@@ -498,6 +747,20 @@
*/
#define MCE_DEACTIVATE_LED_PATTERN "req_led_pattern_deactivate"
/** Notify everyone that a led pattern has been activated
*
* @since v1.25.0
* @return @c gchar @c * led pattern name
*/
#define MCE_LED_PATTERN_ACTIVATED_SIG "led_pattern_activated_ind"
/** Notify everyone that a led pattern has been deactivated
*
* @since v1.25.0
* @return @c gchar @c * led pattern name
*/
#define MCE_LED_PATTERN_DEACTIVATED_SIG "led_pattern_deactivated_ind"
/**
* Enable LED; this does not affect the LED pattern stack
* Note: The GConf setting for LED flashing overrides this value

View File

@@ -163,6 +163,58 @@
*/
#define MCE_DISPLAY_OFF_STRING "off"
/** Blank prevent state name for active
*
* @since v1.51.0
*/
#define MCE_PREVENT_BLANK_ACTIVE_STRING "active"
/** Blank prevent state name for inactive
*
* @since v1.51.0
*/
#define MCE_PREVENT_BLANK_INACTIVE_STRING "inactive"
/** Blank inhibit state name for active
*
* @since v1.51.0
*/
#define MCE_INHIBIT_BLANK_ACTIVE_STRING "active"
/** Blank inhibit state name for inactive
*
* @since v1.51.0
*/
#define MCE_INHIBIT_BLANK_INACTIVE_STRING "inactive"
/** Default blanking policy active
*
* @since v1.55.0
*/
#define MCE_BLANKING_POLICY_DEFAULT_STRING "default"
/** Default blanking policy disabled due to notifications
*
* @since v1.55.0
*/
#define MCE_BLANKING_POLICY_NOTIFICATION_STRING "notification"
/** Default blanking policy disabled due to alarm dialog state
*
* @since v1.55.0
*/
#define MCE_BLANKING_POLICY_ALARM_STRING "alarm"
/** Default blanking policy disabled due to call state
*
* @since v1.55.0
*/
#define MCE_BLANKING_POLICY_CALL_STRING "call"
/** Default blanking policy is about to be restored
*
* @since v1.55.0
*/
#define MCE_BLANKING_POLICY_LINGER_STRING "linger"
/**
* CABC name for CABC disabled
*
@@ -187,5 +239,87 @@
* @since v1.8.88
*/
#define MCE_CABC_MODE_MOVING_IMAGE "moving-image"
/**
* POWERKEY EVENT for single powerkey press
*
* @since v1.10.54
*/
#define MCE_POWERKEY_EVENT_SHORT_PRESS (0u)
/**
* POWERKEY EVENT for long powerkey press
*
* @since v1.10.54
*/
#define MCE_POWERKEY_EVENT_LONG_PRESS (1u)
/**
* POWERKEY EVENT for double powerkey press
*
* @since v1.10.54
*/
#define MCE_POWERKEY_EVENT_DOUBLE_PRESS (2u)
/** USB cable state is not known
*
* @since v1.86.0
*/
#define MCE_USB_CABLE_STATE_UNKNOWN "unknown"
/** USB cable is connected
*
* @since v1.86.0
*/
#define MCE_USB_CABLE_STATE_CONNECTED "connected"
/** USB cable is disconnected
*
* @since v1.86.0
*/
#define MCE_USB_CABLE_STATE_DISCONNECTED "disconnected"
/** Charger state is not known
*
* @since v1.86.0
*/
#define MCE_CHARGER_STATE_UNKNOWN "unknown"
/** Charger is active
*
* @since v1.86.0
*/
#define MCE_CHARGER_STATE_ON "on"
/** Charger is inactive
*
* @since v1.86.0
*/
#define MCE_CHARGER_STATE_OFF "off"
/** Battery status is not known
*
* @since v1.86.0
*/
#define MCE_BATTERY_STATUS_UNKNOWN "unknown"
/** Battery is full
*
* @since v1.86.0
*/
#define MCE_BATTERY_STATUS_FULL "full"
/** Battery is neither full nor empty
*
* @since v1.86.0
*/
#define MCE_BATTERY_STATUS_OK "ok"
/** Battery is low on power
*
* @since v1.86.0
*/
#define MCE_BATTERY_STATUS_LOW "low"
/** Battery is empty
*
* @since v1.86.0
*/
#define MCE_BATTERY_STATUS_EMPTY "empty"
/** Battery level percentage is not known
*
* @since v1.86.0
*/
#define MCE_BATTERY_LEVEL_UNKNOWN (-1)
#endif /* _MCE_MODE_NAMES_H_ */

2
mce.pc
View File

@@ -3,7 +3,7 @@ includedir=${prefix}/include
Name: mce
Description: Mode Control Entity
Version: 1.12.3
Version: 1.21.0
Requires:
Libs:
Cflags: -I${includedir}

22
rpm/mce-headers.changes Normal file
View File

@@ -0,0 +1,22 @@
* Wed Mar 06 2013 Simo Piiroinen <simo.piiroinen@jollamobile.com> - 1.12.3
- Added cpu-keepalive methods
- Removed unintentional mce-doc -> mce-headers dependency
* Mon Dec 10 2012 Marko Saukko <marko.saukko@jollamobile.com> - 1.12.2
- Updated packaging.
* Wed Oct 31 2012 Islam Amer <islam.amer@jollamobile.com> - 1.12.2
- Version bump to 1.12.2 to sync with mce version
- Added MCE_TK_LOCKED_DELAY
* Sun Dec 18 2011 Markus Lehtonen <markus.lehtonen@iki.fi> - 1.11.0
- Version bump to 1.11.0
* Mon Oct 24 2011 Marko Saukko <marko.saukko@cybercom.com> - 1.10.26-1
- Added .yaml for spectacle.
* Fri Jan 28 2011 Tapio Rantala <ext-tapio.rantala@nokia.com> - 1.10.26-1
- New upstream version (BMC#13081)
* Wed Jan 19 2011 Tapio Rantala <ext-tapio.rantala@nokia.com> - 1.10.24-1
- Initial meego packaging (FEA#5525) (FEA#5526) (FEA#5527) (FEA#5528)

46
rpm/mce-headers.spec Normal file
View File

@@ -0,0 +1,46 @@
Name: mce-headers
Summary: Development files for mce
Version: 1.21.0
Release: 1
Group: Development/Libraries
License: LGPLv2
URL: https://github.com/nemomobile/mce-dev
Source0: %{name}-%{version}.tar.bz2
BuildRequires: doxygen
%description
This package contains headers defining the D-Bus method calls
provided by the Mode Control Entity, and the signals emitted by it.
%package -n mce-doc
Summary: Documentation files for mce D-Bus API
Group: Documentation
BuildArch: noarch
%description -n mce-doc
This package contains documentation describing the D-Bus method calls
provided by the Mode Control Entity, and the signals emitted by it.
%prep
%setup -q -n %{name}-%{version}
%build
make %{?jobs:-j%jobs}
make doc
%install
rm -rf %{buildroot}
%make_install
install -d %{buildroot}/%{_docdir}/mce-doc/html/
install -m 644 doc/html/* %{buildroot}/%{_docdir}/mce-doc/html/
%files
%defattr(-,root,root,-)
%doc COPYING debian/copyright
%{_includedir}/mce/*.h
%{_libdir}/pkgconfig/mce.pc
%files -n mce-doc
%defattr(-,root,root,-)
%doc COPYING debian/changelog debian/copyright
%{_docdir}/mce-doc/html/*

43
verify_version Executable file
View File

@@ -0,0 +1,43 @@
#!/bin/sh
# Check that all files that should have the current version agree on it
PC_PATH=mce.pc
PC_VERS=$(grep '^Version:' $PC_PATH |sed -e 's/^.*:[[:space:]]*//')
DEB_PATH=debian/changelog
DEB_VERS=$(head -1 $DEB_PATH | sed -e 's/^.*(//' -e 's/).*$//')
RPM_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-mce-headers}.spec
RPM_VERS=$(grep '^Version:' $RPM_PATH |sed -e 's/^.*:[[:space:]]*//')
# Remove initial part of rpm version that equals with version from pkgconfig
RPM_XTRA=${RPM_VERS#$PC_VERS}
# From that remove initial part that equals with version from spec-file
RPM_XTRA=${RPM_XTRA#$RPM_VERS}
# If the result is non-empty string, then OBS is doing
# delta-after-matching-tag kind of build, which is ok.
# But empty string means that spec and Makefile are completely
# out of sync, which is bad.
RES=0
if [ "$DEB_VERS" != "$PC_VERS" ]; then
echo >&2 "$PC_PATH $PC_VERS vs $DEB_PATH $DEB_VERS"
RES=1
fi
if [ "$RPM_VERS" != "$PC_VERS" ]; then
if [ -z "$RPM_XTRA" ]; then
echo >&2 "$PC_PATH $PC_VERS vs $RPM_PATH $RPM_VERS"
RES=1
else
echo "(ignoring patch level in spec file: $RPM_XTRA)"
fi
fi
if [ $RES != 0 ]; then
echo >&2 "Conflicting package versions"
fi
exit $RES