Bump mce-dev version to 1.28.3

[mce-dev] Set rpm build arch to noarch. JB#49548 Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>
Merge branch 'noarch' into 'master'
2020-09-01 11:45:32 +03:00 · 2020-09-01 08:41:52 +00:00 · 2020-08-31 18:16:06 +03:00 · 2020-05-25 16:45:16 +03:00 · 2020-05-25 13:42:09 +00:00 · 2020-05-25 13:42:09 +00:00
6 changed files with 108 additions and 6 deletions
--- a/6
+++ b/6
@@ -31,11 +31,11 @@ distclean:: clean

 DESTDIR    ?= /tmp/test-mce-dev

-PCDIR      := /usr/lib/pkgconfig
+PCDIR      ?= /usr/lib/pkgconfig
 INCLUDEDIR := /usr/include/mce

-INSTALL_DIR  := install --mode=755 --directory
-INSTALL_DATA := install --mode=644
+INSTALL_DIR  := install -m 755 -d
+INSTALL_DATA := install -m 644


 # ----------------------------------------------------------------------------
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,27 @@
+mce-dev (1.28.3) unstable; urgency=low
+
+  * [mce-dev] Set rpm build arch to noarch
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 01 Sep 2020 11:42:42 +0300
+
+mce-dev (1.28.2) unstable; urgency=low
+
+  * [aarch64] Specify pcdir with use of libdir. Contributes to JB#49681
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 25 May 2020 16:43:30 +0300
+
+mce-dev (1.28.1) unstable; urgency=low
+
+  * [mce-dev] Make the makefile compatible with Busybox
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 07 Apr 2020 09:20:57 +0300
+
+mce-dev (1.28.0) unstable; urgency=low
+
+  * [mce] Add charger state D-Bus constants. JB#44852
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 08 Oct 2019 12:59:35 +0300
+
 mce-dev (1.27.0) unstable; urgency=low

  * [mce] Add charger type D-Bus constants. JB#38667
--- a/include/mce/dbus-names.h
+++ b/include/mce/dbus-names.h
@@ -847,6 +847,32 @@
 */
 # define MCE_BATTERY_STATUS_SIG            "battery_status_ind"

+/** Query current battery state
+ *
+ * @since mce 1.104.0
+ *
+ * @return string: current battery state, one of:
+ * - #MCE_BATTERY_STATE_UNKNOWN
+ * - #MCE_BATTERY_STATE_CHARGING
+ * - #MCE_BATTERY_STATE_DISCHARGING
+ * - #MCE_BATTERY_STATE_NOT_CHARGING
+ * - #MCE_BATTERY_STATE_FULL
+ */
+#define MCE_BATTERY_STATE_GET              "get_battery_state"
+
+/** Signal that indicates that battery state has changed
+ *
+ * @since mce 1.104.0
+ *
+ * @param battery_state string: current battery state, one of:
+ * - #MCE_BATTERY_STATE_UNKNOWN
+ * - #MCE_BATTERY_STATE_CHARGING
+ * - #MCE_BATTERY_STATE_DISCHARGING
+ * - #MCE_BATTERY_STATE_NOT_CHARGING
+ * - #MCE_BATTERY_STATE_FULL
+ */
+#define MCE_BATTERY_STATE_SIG              "battery_state_ind"
+
 /** Query current battery level
 *
 * @since mce 1.86.0
--- a/include/mce/mode-names.h
+++ b/include/mce/mode-names.h
@@ -485,6 +485,8 @@
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Battery Status Constants
+ *
+ * These values match legacy maemo (bme) battery status values.
 *
 *@{
 */
@@ -521,6 +523,55 @@

 /*@}*/

+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Battery State Constants
+ *
+ * These values match linux power supply device status values.
+ *
+ *@{
+ */
+
+/** Battery state is not known
+ *
+ * @since mce 1.104.0
+ */
+# define MCE_BATTERY_STATE_UNKNOWN               "unknown"
+
+/** Battery is currently discharging
+ *
+ * Charger is disconnected, battery is discharging.
+ *
+ * @since mce 1.104.0
+ */
+# define MCE_BATTERY_STATE_DISCHARGING           "discharging"
+
+/** Battery is currently charging
+ *
+ * Charger is connected, battery is charging.
+ *
+ * @since mce 1.104.0
+ */
+# define MCE_BATTERY_STATE_CHARGING              "charging"
+
+/** Battery is not getting charged
+ *
+ * Charger is connected, battery is not getting charged.
+ *
+ * @since mce 1.104.0
+ */
+# define MCE_BATTERY_STATE_NOT_CHARGING          "not_charging"
+
+/** Battery is fully charged
+ *
+ * Charger is connected, battery is full.
+ *
+ * @since mce 1.104.0
+ */
+# define MCE_BATTERY_STATE_FULL                  "full"
+
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Battery Level Constants
--- a/mce.pc
+++ b/mce.pc
@@ -3,7 +3,7 @@ includedir=${prefix}/include

 Name: mce
 Description: Mode Control Entity
-Version: 1.27.0
+Version: 1.28.3
 Requires:
 Libs:
 Cflags: -I${includedir}
--- a/rpm/mce-headers.spec
+++ b/rpm/mce-headers.spec
@@ -1,11 +1,12 @@
 Name:       mce-headers
 Summary:    Development files for mce
-Version:    1.27.0
+Version:    1.28.3
 Release:    1
 Group:      Development/Libraries
 License:    LGPLv2
 URL:        https://git.sailfishos.org/mer-core/mce-dev
 Source0:    %{name}-%{version}.tar.bz2
+BuildArch:  noarch
 BuildRequires:  doxygen

 %description
@@ -31,7 +32,7 @@ make doc

 %install
 rm -rf %{buildroot}
-%make_install
+make install PCDIR=%{_libdir}/pkgconfig DESTDIR=%{?buildroot}
 install -d %{buildroot}/%{_docdir}/mce-doc/html/
 install -m 644 doc/html/* %{buildroot}/%{_docdir}/mce-doc/html/
Author	SHA1	Message	Date
Simo Piiroinen	9d2cb2a039	Bump mce-dev version to 1.28.3 [mce-dev] Set rpm build arch to noarch. JB#49548 Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2020-09-01 11:45:32 +03:00
spiiroin	0ffea0bfce	Merge branch 'noarch' into 'master' Set rpm build arch to noarch See merge request mer-core/mce-dev!15	2020-09-01 08:41:52 +00:00
Rinigus	3a14b1da00	[mce-dev] Set rpm build arch to noarch Signed-off-by: Rinigus <rinigus.git@gmail.com>	2020-08-31 18:16:06 +03:00
Simo Piiroinen	d79b26d86c	Bump mce-dev version to 1.28.2	2020-05-25 16:45:16 +03:00
spiiroin	93b92f9b2b	Merge branch 'jb49681' into 'master' [aarch64] Specify pcdir with use of libdir. Contributes to JB#49681 See merge request mer-core/mce-dev!14	2020-05-25 13:42:09 +00:00
Niels Breet	2f21adad01	[aarch64] Specify pcdir with use of libdir. Contributes to JB#49681	2020-05-25 13:42:09 +00:00
Simo Piiroinen	a50532c2d7	Bump mce-dev version to 1.28.1 [mce-dev] Make the makefile compatible with Busybox. JB#49548	2020-04-07 09:28:40 +03:00
pvuorela	f803d51e0e	Merge branch 'makefile-busybox' into 'master' Make the makefile compatible with Busybox See merge request mer-core/mce-dev!13	2020-04-02 14:02:15 +00:00
Bart Ribbers	5b816ac676	Make the makefile compatible with Busybox Busybox follows stricter POSIX standards, and doesn't support the --mode and --directory arguments, but rather uses the shorthand variants -m and -d	2020-03-25 12:35:09 +01:00
Simo Piiroinen	4156ad426d	Bump mce-dev version to 1.28.0	2019-10-08 13:01:09 +03:00
spiiroin	4990e6331c	Merge branch 'jb44852_battery_state' into 'master' Add charger state D-Bus constants See merge request mer-core/mce-dev!12	2019-10-08 09:58:46 +00:00
Simo Piiroinen	b1bad1c065	[mce] Add charger state D-Bus constants. JB#44852 Constants related to exposing charger state on D-Bus. Signed-off-by: Simo Piiroinen <simo.piiroinen@jollamobile.com>	2019-10-07 12:57:10 +03:00