Compare commits

...

4 Commits

Author SHA1 Message Date
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
6 changed files with 86 additions and 3 deletions

7
debian/changelog vendored
View File

@@ -1,3 +1,10 @@
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 mce-dev (1.12.3) unstable; urgency=low
* Added cpu-keepalive methods * Added cpu-keepalive methods

View File

@@ -396,6 +396,28 @@
*/ */
#define MCE_CPU_KEEPALIVE_WAKEUP_REQ "req_cpu_keepalive_wakeup" #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"
/*@}*/ /*@}*/
/** /**
@@ -468,6 +490,16 @@
*/ */
#define MCE_CALL_STATE_SIG "sig_call_state_ind" #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"
/*@}*/ /*@}*/
/** /**

2
mce.pc
View File

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

View File

@@ -9,7 +9,7 @@ Name: mce-headers
# << macros # << macros
Summary: Development files for mce Summary: Development files for mce
Version: 1.12.3 Version: 1.12.4
Release: 1 Release: 1
Group: Development/Libraries Group: Development/Libraries
License: LGPLv2 License: LGPLv2

View File

@@ -1,6 +1,6 @@
Name: mce-headers Name: mce-headers
Summary: Development files for mce Summary: Development files for mce
Version: 1.12.3 Version: 1.12.4
Release: 1 Release: 1
Group: Development/Libraries Group: Development/Libraries
License: LGPLv2 License: LGPLv2

44
verify_version Executable file
View File

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