Bump mce-dev version to 1.17.0

Add D-Bus constants for exposing display blanking policy

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,51 @@
+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

include/mce/dbus-names.h

@@ -262,6 +262,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 +288,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
  *
@@ -346,7 +385,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 +414,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 +431,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"
@@ -418,6 +474,19 @@
  */
 #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"
 /*@}*/
 
 /**
@@ -444,6 +513,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
  *
@@ -510,8 +606,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
@@ -521,8 +620,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
@@ -530,6 +632,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

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
  *

mce.pc

@@ -3,7 +3,7 @@ includedir=${prefix}/include
 
 Name: mce
 Description: Mode Control Entity
-Version: 1.12.4
+Version: 1.17.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.12.4
+Version:    1.17.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,26 @@ 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
-
-
 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.12.4
-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

@@ -11,21 +11,9 @@ 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:]]*//')
 
-YAML_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-mce-headers}.yaml
-
 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