Bump mce-dev version to 1.12.4

Helps to remember all the places that need to be modified
before releasing a new version.

Makefile

@@ -21,12 +21,15 @@ PCFILE  := mce.pc
 INCLUDE_FILES := $(INCDIR)/dbus-names.h $(INCDIR)/mode-names.h
 
 .PHONY: doc
-doc:
+doc:	doc/warnings
+
+doc/warnings: $(INCLUDE_FILES) Doxyfile
+	@if [ ! -d "$(DOCDIR)" ]; then mkdir "$(DOCDIR)"; fi
 	@$(DOXYGEN) 2> $(TOPDIR)/doc/warnings > /dev/null
 
 clean:
 	@if [ x"$(DOCDIR)" != x"" ]; then	\
-		rm -rf $(DOCDIR)/*;		\
+		rm -rf "$(DOCDIR)";		\
 	fi
 
 .PHONY: install

debian/changelog

@@ -1,3 +1,45 @@
+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
+  * Removed unintentional mce-doc -> mce-headers dependency
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Wed, 06 Mar 2013 11:41:15 +0200
+
+mce-dev (1.12.2) oneiric; urgency=low
+
+  * Added MCE_TK_LOCKED_DELAY
+  * Version sync with mce itself
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Wed, 31 Oct 2012 19:38:56 +0200
+
+mce-dev (1.11.0) unstable; urgency=low
+
+  * Added MCE_COLOR_PROFILE_GET, MCE_COLOR_PROFILE_IDS_GET,
+    MCE_COLOR_PROFILE_CHANGE_REQ, MCE_COLOR_PROFILE_SIG (Fixes: NB#269000)
+
+ -- Santtu Lakkala <ext-santtu.1.lakkala@nokia.com>  Mon, 12 Sep 2011 12:56:11 +0300
+
+mce-dev (1.10.28) unstable; urgency=low
+
+  * Added MCE_ADD_ACTIVITY_CALLBACK_REQ and MCE_REMOVE_ACTIVITY_CALLBACK_REQ
+    (Fixes: NB#239760)
+
+ -- David Weinehall <david.weinehall@nokia.com>  Fri, 08 Apr 2011 15:43:13 +0300
+
+mce-dev (1.10.27) unstable; urgency=low
+
+  * Added credential annotations (Fixes: NB#231412)
+  * Removed deprecated MCE_TK_SILENT variants
+
+ -- David Weinehall <david.weinehall@nokia.com>  Mon, 28 Feb 2011 14:25:23 +0200
+
 mce-dev (1.10.26) unstable; urgency=low
 
   * Fixed errors in the doc-base file

debian/control

@@ -1,8 +1,8 @@
 Source: mce-dev
 Section: devel
 Priority: optional
-Maintainer: David Weinehall <david.weinehall@nokia.com>
-Uploaders: Tuomo Tanskanen <ext-tuomo.1.tanskanen@nokia.com>
+Maintainer: Santtu Lakkala <ext-santtu.1.lakkala@nokia.com>
+Uploaders: Tuomo Tanskanen <ext-tuomo.1.tanskanen@nokia.com>, Jukka Turunen <ext-jukka.t.turunen@nokia.com>
 Build-Depends: debhelper (>= 5.0.0)
 Build-Depends-Indep: doxygen
 Standards-Version: 3.7.3

include/mce/dbus-names.h

@@ -4,7 +4,7 @@
  * <p>
  * This file is part of mce-dev
  * <p>
- * Copyright © 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
+ * Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
  * <p>
  * @author David Weinehall <david.weinehall@nokia.com>
  *
@@ -148,6 +148,30 @@
  */
 #define MCE_KEY_BACKLIGHT_STATE_GET	"get_key_backlight_state"
 
+/**
+ * Add an activity notification callback;
+ * the next user activity will trigger this callback
+ * callbacks are one-shot -- once the callback has been invoked,
+ * it will be unregistered
+ *
+ * @since 1.10.106
+ * @param service @c gchar @c * The method call service
+ * @param path @c gchar @c * The method call path
+ * @param interface @c gchar @c * The method call interface
+ * @param name @c gchar @c * The name of the method to call
+ * @return @c dbus_bool_t @c TRUE if registration was successful,
+ *                        @c FALSE if registration was a failure
+ *                           (too many registered clients)
+ */
+#define MCE_ADD_ACTIVITY_CALLBACK_REQ	"add_activity_callback"
+
+/**
+ * Remove any activity notification callback belonging to the calling process
+ *
+ * @since 1.10.106
+ */
+#define MCE_REMOVE_ACTIVITY_CALLBACK_REQ	"remove_activity_callback"
+
 /**
  * Query the inactivity status
  *
@@ -157,6 +181,22 @@
  */
 #define MCE_INACTIVITY_STATUS_GET	"get_inactivity_status"
 
+/**
+ * Query the current color profile id
+ *
+ * @since v1.11.2
+ * @return @c gchar @c * with the the current profile id
+ */
+#define MCE_COLOR_PROFILE_GET		"get_color_profile"
+
+/**
+ * Query the list of the available color profile ids
+ *
+ * @since v1.11.2
+ * @return @c gchar @c ** with the nul-terminated array of the color profile ids
+ */
+#define MCE_COLOR_PROFILE_IDS_GET		"get_color_profile_ids"
+
 /**
  * Query the MCE version
  *
@@ -169,6 +209,7 @@
  * Request radio states change
  *
  * @since v1.10.60
+ * @credential mce::DeviceModeControl
  * @param @c dbus_uint32_t New radio states or:ed together
  *        (see @ref mce/mode-names.h for defines for the radio states)
  * @param @c dbus_uint32_t Mask for radio states or:ed together
@@ -190,6 +231,7 @@
  * crashing applications doesn't cause a forever busy call state
  *
  * @since v1.8.1
+ * @credential mce::CallStateControl
  * @param call_state @c gchar @c * with the new call state
  *             (see @ref mce/mode-names.h for valid call states)
  * @param call_type @c gchar @c * with the new call type
@@ -249,6 +291,7 @@
  * Request tklock mode change
  *
  * @since v1.4.0
+ * @credential mce::TKLockControl
  * @param mode @c gchar @c * with the new touchscreen/keypad lock mode
  *             (see @ref mce/mode-names.h for valid lock modes)
  */
@@ -257,6 +300,7 @@
 /**
  * Request powerkey event triggering
  *
+ * @credential mce::DeviceModeControl
  * @since v1.5.3
  * @param type @c dbus_bool_t with the type of powerkey event to
  *                trigger; @c FALSE == short powerkey press,
@@ -269,6 +313,111 @@
  */
 #define MCE_TRIGGER_POWERKEY_EVENT_REQ	"req_trigger_powerkey_event"
 
+/**
+ * Request color profile change
+ *
+ * @since v1.11.2
+ * @credential mce::ColorProfileControl
+ * @param mode @c gchar @c * with the new color profile id
+ *             (see @ref MCE_COLOR_PROFILE_IDS_GET to learn
+ *              how to get the valid color profile ids)
+ */
+#define MCE_COLOR_PROFILE_CHANGE_REQ	"req_color_profile_change"
+
+/** Query the length of time late suspend can be blocked
+ *
+ * The idea is: if some process needs to do non-interactive
+ * background processing, it can prevent the system from
+ * entering late suspend by
+ *
+ * 1) get timer period via #MCE_CPU_KEEPALIVE_PERIOD_REQ call
+ *
+ * 2) call #MCE_CPU_KEEPALIVE_START_REQ
+ *
+ * 3) repeat #MCE_CPU_KEEPALIVE_START_REQ calls in interval
+ *    that is shorter than the maximum obtained at (1)
+ *
+ * 4) call #MCE_CPU_KEEPALIVE_STOP_REQ when finished
+ *
+ * MCE keeps track of active clients and blocks late suspend
+ * until all clients have called #MCE_CPU_KEEPALIVE_STOP_REQ,
+ * lost D-Bus connection (exit, crash, ...) or all timeouts
+ * have been missed.
+ *
+ * @since v1.12.8
+ *
+ * @return period in seconds as DBUS_TYPE_UINT32
+ */
+#define MCE_CPU_KEEPALIVE_PERIOD_REQ	"req_cpu_keepalive_period"
+
+/** Temporarily disable enter late suspend policy
+ *
+ * This method call must be repeated periodically to keep
+ * the system from entering late suspend.
+ *
+ * The period length can be obtained via #MCE_CPU_KEEPALIVE_PERIOD_REQ.
+ *
+ * Note: The boolean reply message is optional and will be sent
+ *       only if requested.
+ *
+ * @since v1.12.8
+ *
+ * @return success as DBUS_TYPE_BOOLEAN
+ */
+#define MCE_CPU_KEEPALIVE_START_REQ	"req_cpu_keepalive_start"
+
+/** Allow normal enter late suspend policy again
+ *
+ * If a process blocks late suspend via #MCE_CPU_KEEPALIVE_START_REQ,
+ * it must call #MCE_CPU_KEEPALIVE_STOP_REQ when background processing
+ * is finished to enable normal late suspend policy again.
+ *
+ * Note: The boolean reply message is optional and will be sent
+ *       only if requested.
+ *
+ * @since v1.12.8
+ *
+ * @return success as DBUS_TYPE_BOOLEAN
+ */
+#define MCE_CPU_KEEPALIVE_STOP_REQ	"req_cpu_keepalive_stop"
+
+/** Signal wakeup from suspend due to aligned timer triggering
+ *
+ * NOTE: This is reserved for use from dsme iphb module and is
+ * used to transfer ownership of rtc irq wakeup wakelock from
+ * dsme to mce.
+ *
+ * Note: The boolean reply message is optional and will be sent
+ *       only if requested.
+ *
+ * @since v1.12.8
+ *
+ * @return success as DBUS_TYPE_BOOLEAN
+ */
+#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"
+
+/** 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"
+
 /*@}*/
 
 /**
@@ -313,6 +462,14 @@
  */
 #define MCE_INACTIVITY_SIG		"system_inactivity_ind"
 
+/**
+ * Notify everyone that the color profile has changed
+ *
+ * @since v1.11.2
+ * @return @c gchar @c * with the color profile id
+ */
+#define MCE_COLOR_PROFILE_SIG		"color_profile_ind"
+
 /**
  * Notify everyone that the radio states have changed
  *
@@ -333,6 +490,16 @@
  */
 #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"
+
+
 /*@}*/
 
 /**
@@ -345,6 +512,7 @@
  * Activates a pre-defined LED pattern
  * Non-existing patterns are ignored
  *
+ * @credential mce::LEDControl
  * @since v1.5.0
  * @param pattern @c gchar @c * with the pattern name
  *                (see @c /etc/mce/mce.ini for valid pattern names)
@@ -355,6 +523,7 @@
  * Deactivates a pre-defined LED pattern
  * Non-existing patterns are ignored
  *
+ * @credential mce::LEDControl
  * @since v1.5.0
  * @param pattern @c gchar @c * with the pattern name
  *                (see @c /etc/mce/mce.ini for valid pattern names)
@@ -372,6 +541,7 @@
  *       since some patterns should *always* be visible
  *       this interface is meant for testing and development only
  *
+ * @credential mce::LEDControl
  * @since v1.5.0
  */
 #define MCE_ENABLE_LED			"req_led_enable"
@@ -382,6 +552,7 @@
  *       since some patterns should *always* be visible
  *       this interface is meant for testing and development only
  *
+ * @credential mce::LEDControl
  * @since v1.5.0
  */
 #define MCE_DISABLE_LED			"req_led_disable"

include/mce/mode-names.h

@@ -119,6 +119,12 @@
  * @since v1.4.15
  */
 #define MCE_TK_LOCKED_DIM			"locked-dim"
+/**
+ * Touchscreen/Keypad locked with delay
+ *
+ * @since v1.12.2
+ */
+#define MCE_TK_LOCKED_DELAY			"locked-delay"
 /**
  * Touchscreen/Keypad silently locked with fadeout
  *

mce.pc

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

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

@@ -0,0 +1,12 @@
+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.changes

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

rpm/mce-headers.spec

@@ -0,0 +1,80 @@
+# 
+# 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
+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
+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}
+
+# %{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

@@ -0,0 +1,30 @@
+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

@@ -0,0 +1,44 @@
+#!/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/).*$//')
+
+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
+fi
+
+if [ "$SPEC_VERS" != "$PC_VERS" ]; then
+  echo >&2 "$PC_PATH $PC_VERS vs $SPEC_PATH $SPEC_VERS"
+  RES=1
+fi
+
+
+if [ $RES != 0 ]; then
+  echo >&2 "Conflicting package versions"
+fi
+
+exit $RES