debian files

Signed-off-by: Simo Piiroinen <simo.piiroinen@jolla.com>

Makefile

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

debian/Jenkinsfile

@@ -0,0 +1,10 @@
+@Library('ubports-build-tools') _
+
+buildAndProvideDebianPackage()
+
+// Or if the package consists entirely of arch-independent packages:
+// (optional optimization, will confuse BlueOcean's live view at build stage)
+// buildAndProvideDebianPackage(/* isArchIndependent */ true)
+
+// Optionally, to skip building on some architectures (amd64 is always built):
+// buildAndProvideDebianPackage(false, /* ignoredArchs */ ['arm64'])

debian/changelog

@@ -1,3 +1,48 @@
+mce-dev (1.29.0-1ubports1) focal; urgency=medium
+
+  * Port to focal
+  * Update to dh version 12
+  * Remove obsolete files
+  * Install architecture independent mce.pc in /usr/share/pkgconfig
+
+ -- Guido Berhoerster <guido+gitlab.com@berhoerster.name>  Thu, 09 Dec 2021 11:20:24 +0100
+
+mce-dev (1.29.0) unstable; urgency=low
+
+  * [mce] Add mouse availability state D-Bus constants. JB#55866
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Mon, 25 Oct 2021 18:09:15 +0300
+
+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
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 26 Aug 2019 09:36:42 +0300
+
 mce-dev (1.26.1) unstable; urgency=low
 
   * [mce-dev] fix url. Contributes to JB#33684

debian/compat

@@ -1 +0,0 @@
-5

debian/control

@@ -1,9 +1,8 @@
 Source: mce-dev
 Section: devel
 Priority: optional
-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)
+Maintainer: UBports developers <devs@ubports.com>
+Build-Depends: debhelper-compat (= 12)
 Build-Depends-Indep: doxygen
 Standards-Version: 3.7.3
 

debian/mce-dev.install

@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/pkgconfig/*
-debian/tmp/usr/include/mce/*
+mce.pc usr/share/pkgconfig/
+usr/include/mce/*

debian/rules

@@ -1,64 +1,17 @@
 #!/usr/bin/make -f
-# debian/rules for mce-dev using debhelper.
-# Copyright © 2004-2009 Nokia Corporation.  All rights reserved.
+# You must remove unused comment lines for the released package.
+#export DH_VERBOSE = 1
+#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
+#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+override_dh_auto_build:
+	dh_auto_build -- doc
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+override_dh_auto_install:
+	dh_auto_install
+	# mce.pc is installed manually in usr/share/pkgconfig
+	rm -rf debian/tmp/usr/lib/pkgconfig
 
-pkgdir = $(CURDIR)/debian/tmp
-
-pcfileversion := $$(grep -m1 '^Version' mce.pc | sed -e 's/Version: *//')
-changelogversion := $$(grep -m1 'mce-dev (' debian/changelog | sed -e 's/mce-dev (\(.*\)).*/\1/;s/\(^'$(pcfileversion)'\).*/\1/')
-
-.PHONY: clean
-clean:
-	dh_testdir
-	dh_testroot
-
-	$(MAKE) distclean
-
-	dh_clean
-
-.PHONY: check
-check:
-	@if [ x"$(pcfileversion)" != x"$(changelogversion)" ]; then \
-		printf "error: version-number mismatch\n"; \
-		printf "changelog version: $(changelogversion)\n"; \
-		printf ".pc-file version: $(pcfileversion)\n"; \
-		exit 1; \
-	fi
-
-.PHONY: build
-build: check
-	dh_testdir
-
-	$(MAKE) doc
-
-.PHONY: install
-install:
-	$(MAKE) install DESTDIR="$(pkgdir)"
-
-.PHONY: binary-indep
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installdocs
-	dh_installchangelogs
-	dh_install -i
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_installdeb
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-.PHONY: binary-arch
-binary-arch: build install
-# nothing to see here, move along
-
-.PHONY: binary
-binary: binary-indep binary-arch
+%:
+	dh $@

debian/source/format

@@ -0,0 +1 @@
+3.0 (native)

include/mce/dbus-names.h

@@ -5,7 +5,8 @@
  * This file is part of mce-dev
  * <p>
  * Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2013-2017 Jolla Ltd.
+ * Copyright (C) 2013-2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
  * <p>
  * @author David Weinehall <david.weinehall@nokia.com>
  * @author Santtu Lakkala <ext-santtu.1.lakkala@nokia.com>
@@ -846,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
@@ -862,6 +889,36 @@
  */
 # define MCE_BATTERY_LEVEL_SIG             "battery_level_ind"
 
+/** Query current charger type
+ *
+ * @since mce 1.102.0
+ *
+ * @return string: current charger type, one of:
+ * - #MCE_CHARGER_TYPE_NONE
+ * - #MCE_CHARGER_TYPE_USB
+ * - #MCE_CHARGER_TYPE_DCP
+ * - #MCE_CHARGER_TYPE_HVDCP
+ * - #MCE_CHARGER_TYPE_CDP
+ * - #MCE_CHARGER_TYPE_WIRELESS
+ * - #MCE_CHARGER_TYPE_OTHER
+ */
+# define MCE_CHARGER_TYPE_GET             "get_charger_type"
+
+/** Signal that indicates that charger type has changed
+ *
+ * @since mce 1.102.0
+ *
+ * @param charger_type string: current charger type, one of:
+ * - #MCE_CHARGER_TYPE_NONE
+ * - #MCE_CHARGER_TYPE_USB
+ * - #MCE_CHARGER_TYPE_DCP
+ * - #MCE_CHARGER_TYPE_HVDCP
+ * - #MCE_CHARGER_TYPE_CDP
+ * - #MCE_CHARGER_TYPE_WIRELESS
+ * - #MCE_CHARGER_TYPE_OTHER
+ */
+# define MCE_CHARGER_TYPE_SIG             "charger_type_ind"
+
 /*@}*/
 
 /////////////////////////////////////////////////////////////////////////////
@@ -1096,6 +1153,44 @@
 
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Hardware Mouse Availability
+ *
+ *@{
+ */
+
+/** Query HW mouse availability
+ *
+ * @since mce 1.109.0
+ *
+ * Mouse present
+ *
+ * Used for example in evaluating whether mouse pointer
+ * should be shown or not.
+ *
+ * @return string: availability state, one of:
+ * - #MCE_HARDWARE_MOUSE_UNDEF
+ * - #MCE_HARDWARE_MOUSE_AVAILABLE
+ * - #MCE_HARDWARE_MOUSE_NOT_AVAILABLE
+ */
+# define MCE_HARDWARE_MOUSE_STATE_GET      "mouse_available_state_req"
+
+/** Notify changes in HW mouse availability
+ *
+ * @since mce 1.109.0
+ *
+ * Mouse present
+ *
+ * @return string: availability state, one of:
+ * - #MCE_HARDWARE_MOUSE_UNDEF
+ * - #MCE_HARDWARE_MOUSE_AVAILABLE
+ * - #MCE_HARDWARE_MOUSE_NOT_AVAILABLE
+ */
+# define MCE_HARDWARE_MOUSE_STATE_SIG      "mouse_available_state_ind"
+
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Sliding Keyboard State

include/mce/mode-names.h

@@ -5,7 +5,8 @@
  * This file is part of mce-dev
  * <p>
  * Copyright © 2004-2011 Nokia Corporation and/or its subsidiary(-ies).
- * Copyright (C) 2012-2017 Jolla Ltd.
+ * Copyright (C) 2012-2019 Jolla Ltd.
+ * Copyright (c) 2019 Open Mobile Platform LLC.
  * <p>
  * @author David Weinehall <david.weinehall@nokia.com>
  * @author Tapio Rantala <ext-tapio.rantala@nokia.com>
@@ -430,9 +431,62 @@
 
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Charger Type Constants
+ *
+ *@{
+ */
+
+/** No charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_NONE                   "none"
+
+/** Standard down port (pc/hub) charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_USB                    "usb"
+
+/** Dedicated charging port (wall) charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_DCP                    "dcp"
+
+/** High voltage DCP charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_HVDCP                  "hvdcp"
+
+/** Charging Downstream Port charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_CDP                    "cdp"
+
+/** Wireless charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_WIRELESS               "wireless"
+
+/** Other kind of charger is active
+ *
+ * @since mce 1.102.0
+ */
+# define MCE_CHARGER_TYPE_OTHER                  "other"
+
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Battery Status Constants
+ *
+ * These values match legacy maemo (bme) battery status values.
  *
  *@{
  */
@@ -469,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
@@ -531,6 +634,32 @@
 # define MCE_HARDWARE_KEYBOARD_NOT_AVAILABLE     "not-available"
 /*@}*/
 
+/////////////////////////////////////////////////////////////////////////////
+/////////////////////////////////////////////////////////////////////////////
+/** @name Hardware Mouse Availability Constants
+ *
+ *@{
+ */
+
+/** Hardware Mouse availability is not known
+ *
+ * @since mce 1.109.0
+ */
+# define MCE_HARDWARE_MOUSE_UNDEF                "undef"
+
+/** Hardware Mouse is available
+ *
+ * @since mce 1.109.0
+ */
+# define MCE_HARDWARE_MOUSE_AVAILABLE            "available"
+
+/** Hardware Mouse is not available
+ *
+ * @since mce 1.109.0
+ */
+# define MCE_HARDWARE_MOUSE_NOT_AVAILABLE        "not-available"
+/*@}*/
+
 /////////////////////////////////////////////////////////////////////////////
 /////////////////////////////////////////////////////////////////////////////
 /** @name Feedback Event Name Constants

mce.pc

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

rpm/mce-headers.spec

@@ -1,11 +1,12 @@
 Name:       mce-headers
 Summary:    Development files for mce
-Version:    1.26.1
+Version:    1.29.0
 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/