Bump mce-dev version to 1.22.0

Add input policy related D-Bus constants

See merge request !5

Makefile

@@ -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
 

debian/changelog

@@ -1,3 +1,61 @@
+mce-dev (1.22.0) unstable; urgency=low
+
+  * [mce] Add input policy related D-Bus constants. JB#38001
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 10 Apr 2017 15:22:37 +0300
+
+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.

include/mce/dbus-names.h

@@ -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
  *
@@ -288,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
  *
@@ -318,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"
 
@@ -436,6 +474,18 @@
  */
 #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
@@ -447,6 +497,71 @@
  */
 #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"
 /*@}*/
 
 /**
@@ -473,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
  *
@@ -528,6 +670,46 @@
  */
 #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"
 
 /*@}*/
 
@@ -608,4 +790,59 @@
 
 /*@}*/
 
+/**
+ * @name Input policy D-Bus methods and signals
+ */
+
+/*@{*/
+
+/** Get current touch screen input policy
+ *
+ * Possible return values are:
+ * - #MCE_INPUT_POLICY_ENABLED
+ * - #MCE_INPUT_POLICY_DISABLED
+ *
+ * @since v1.87.0
+ *
+ * @return input policy as DBUS_TYPE_STRING
+ */
+#define MCE_TOUCH_INPUT_POLICY_GET      "get_touch_input_policy"
+
+/** Indication for change of touch screen input policy
+ *
+ * Possible values are:
+ * - #MCE_INPUT_POLICY_ENABLED
+ * - #MCE_INPUT_POLICY_DISABLED
+ *
+ * @since v1.87.0
+ *
+ * @param input policy as DBUS_TYPE_STRING
+ */
+#define MCE_TOUCH_INPUT_POLICY_SIG      "touch_input_policy_ind"
+
+/** Get current volume key input policy
+ *
+ * Possible return values are:
+ * - #MCE_INPUT_POLICY_ENABLED
+ * - #MCE_INPUT_POLICY_DISABLED
+ *
+ * @since v1.87.0
+ *
+ * @return input policy as DBUS_TYPE_STRING
+ */
+#define MCE_VOLKEY_INPUT_POLICY_GET     "get_keypad_input_policy"
+
+/** Indication for change of volume key input policy
+ *
+ * Possible values are:
+ * - #MCE_INPUT_POLICY_ENABLED
+ * - #MCE_INPUT_POLICY_DISABLED
+ *
+ * @since v1.87.0
+ *
+ * @param input policy as DBUS_TYPE_STRING
+ */
+#define MCE_VOLKEY_INPUT_POLICY_SIG     "keypad_input_policy_ind"
+
+/*@}*/
 #endif /* _MCE_DBUS_NAMES_H_ */

include/mce/mode-names.h

@@ -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,99 @@
  * @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)
+
+/** Input events should be processed normally
+ *
+ * @since v1.87.0
+ */
+#define MCE_INPUT_POLICY_ENABLED                "enabled"
+
+/** Input events should be ignored
+ *
+ * @since v1.87.0
+ */
+#define MCE_INPUT_POLICY_DISABLED               "disabled"
 
 #endif /* _MCE_MODE_NAMES_H_ */

mce.pc

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

rpm/mce-headers-1.10.24-no-ownership.patch

@@ -1,12 +0,0 @@
-diff -urN a/Makefile b/Makefile
---- a/Makefile	2009-11-30 09:41:59.397638000 +0200
-+++ b/Makefile	2010-07-07 14:50:26.226452261 +0300
-@@ -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
- 

rpm/mce-headers.spec

@@ -1,29 +1,17 @@
-# 
-# Do NOT Edit the Auto-generated Part!
-# Generated by: spectacle version 0.26
-# 
-
 Name:       mce-headers
-
-# >> macros
-# << macros
-
 Summary:    Development files for mce
-Version:    1.14.0
+Version:    1.22.0
 Release:    1
 Group:      Development/Libraries
 License:    LGPLv2
 URL:        https://github.com/nemomobile/mce-dev
 Source0:    %{name}-%{version}.tar.bz2
-Source100:  mce-headers.yaml
-Patch0:     %{name}-1.10.24-no-ownership.patch
 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
@@ -33,48 +21,27 @@ BuildArch:  noarch
 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}
 
-# %{name}-1.10.24-no-ownership.patch
-%patch0 -p1
-# >> setup
-# << setup
-
 %build
-# >> build pre
-# << build pre
-
-
+./verify_version
 make %{?jobs:-j%jobs}
-
-# >> build post
 make doc
-# << build post
 
 %install
 rm -rf %{buildroot}
-# >> install pre
-# << install pre
 %make_install
-
-# >> install post
 install -d %{buildroot}/%{_docdir}/mce-doc/html/
 install -m 644 doc/html/* %{buildroot}/%{_docdir}/mce-doc/html/
-# << install post
 
 %files
 %defattr(-,root,root,-)
-# >> files
 %doc COPYING debian/copyright
 %{_includedir}/mce/*.h
 %{_libdir}/pkgconfig/mce.pc
-# << files
 
 %files -n mce-doc
 %defattr(-,root,root,-)
-# >> files mce-doc
 %doc COPYING debian/changelog debian/copyright
 %{_docdir}/mce-doc/html/*
-# << files mce-doc

rpm/mce-headers.yaml

@@ -1,30 +0,0 @@
-Name: mce-headers
-Summary: Development files for mce
-Version: 1.14.0
-Release: 1
-Group: Development/Libraries
-License: LGPLv2
-URL: https://github.com/nemomobile/mce-dev
-Sources:
-    - "%{name}-%{version}.tar.bz2"
-Patches:
-    - "%{name}-1.10.24-no-ownership.patch"
-Description: |
-    This package contains headers defining the D-Bus method calls
-    provided by the Mode Control Entity, and the signals emitted by it.
-
-PkgBR:
-    - doxygen
-Configure: none
-Builder: make
-SubPackages:
-    - Name: mce-doc
-      AsWholeName: yes
-      Summary: Documentation files for mce D-Bus API
-      Group: Documentation
-      BuildArch:  noarch
-      AutoDepend: false
-      Description: |
-          This package contains documentation describing the D-Bus method calls
-          provided by the Mode Control Entity, and the signals emitted by it.
-

verify_version

@@ -8,35 +8,34 @@ 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/).*$//')
 
-SPEC_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-mce-headers}.spec
-SPEC_VERS=$(grep '^Version:' $SPEC_PATH |sed -e 's/^.*:[[:space:]]*//')
+RPM_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-mce-headers}.spec
+RPM_VERS=$(grep '^Version:' $RPM_PATH |sed -e 's/^.*:[[:space:]]*//')
 
-YAML_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-mce-headers}.yaml
+# 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
 
-
-# The yaml file is included in the git tree, but not in the tarball
-# that is used during the OBS package build ...
-if [ -f $YAML_PATH ]; then
-  YAML_VERS=$(grep '^Version:' $YAML_PATH |sed -e 's/^.*:[[:space:]]*//')
-  if [ "$SPEC_VERS" != "$YAML_VERS" ]; then
-    echo >&2 "$YAML_PATH $YAML_VERS vs $SPEC_PATH $SPEC_VERS"
-    RES=1
-  fi
-fi
-
 if [ "$DEB_VERS" != "$PC_VERS" ]; then
   echo >&2 "$PC_PATH $PC_VERS vs $DEB_PATH $DEB_VERS"
   RES=1
 fi
 
-if [ "$SPEC_VERS" != "$PC_VERS" ]; then
-  echo >&2 "$PC_PATH $PC_VERS vs $SPEC_PATH $SPEC_VERS"
-  RES=1
+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