Bump mce-dev version to 1.32.0

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

Doxyfile

@@ -272,22 +272,6 @@ SUBGROUPING            = YES
 
 TYPEDEF_HIDES_STRUCT   = NO
 
-# The SYMBOL_CACHE_SIZE determines the size of the internal cache use to 
-# determine which symbols to keep in memory and which to flush to disk. 
-# When the cache is full, less often used symbols will be written to disk. 
-# For small to medium size projects (<1000 input files) the default value is 
-# probably good enough. For larger projects a too small cache size can cause 
-# doxygen to be busy swapping symbols to and from disk most of the time 
-# causing a significant performance penality. 
-# If the system has enough physical memory increasing the cache will improve the 
-# performance by keeping more symbols in memory. Note that the value works on 
-# a logarithmic scale so increasing the size by one will rougly double the 
-# memory usage. The cache size is given by this formula: 
-# 2^(16+SYMBOL_CACHE_SIZE). The valid range is 0..9, the default is 0, 
-# corresponding to a cache size of 2^16 = 65536 symbols
-
-SYMBOL_CACHE_SIZE      = 0
-
 #---------------------------------------------------------------------------
 # Build related configuration options
 #---------------------------------------------------------------------------
@@ -396,7 +380,7 @@ INLINE_INFO            = YES
 # alphabetically by member name. If set to NO the members will appear in 
 # declaration order.
 
-SORT_MEMBER_DOCS       = YES
+SORT_MEMBER_DOCS       = NO
 
 # If the SORT_BRIEF_DOCS tag is set to YES then doxygen will sort the 
 # brief documentation of file, namespace and class members alphabetically 
@@ -466,12 +450,6 @@ MAX_INITIALIZER_LINES  = 30
 
 SHOW_USED_FILES        = YES
 
-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
 # Set the SHOW_FILES tag to NO to disable the generation of the Files page. 
 # This will remove the Files entry from the Quick Index and from the 
 # Folder Tree View (if specified). The default is YES.
@@ -564,7 +542,7 @@ WARN_LOGFILE           =
 # directories like "/usr/src/myproject". Separate the files or directories 
 # with spaces.
 
-INPUT                  = 
+INPUT                  = include/mce
 
 # This tag can be used to specify the character encoding of the source files 
 # that doxygen parses. Internally doxygen uses the UTF-8 encoding, which is 
@@ -792,12 +770,6 @@ HTML_FOOTER            =
 
 HTML_STYLESHEET        = 
 
-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
 # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML 
 # documentation will contain sections that can be hidden and shown after the 
 # page has loaded. For this to work a browser that supports 
@@ -1133,18 +1105,6 @@ GENERATE_XML           = NO
 
 XML_OUTPUT             = xml
 
-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
 # dump the program listings (including syntax highlighting 
 # and cross-referencing information) to the XML output. Note that 
@@ -1354,7 +1314,7 @@ HAVE_DOT               = NO
 # DOTFONTPATH environment variable or by setting DOT_FONTPATH to the directory 
 # containing the font.
 
-DOT_FONTNAME           = FreeSans
+DOT_FONTNAME           =
 
 # The DOT_FONTSIZE tag can be used to set the size of the font of dot graphs. 
 # The default size is 10pt.

Makefile

@@ -5,38 +5,68 @@
 # Author: David Weinehall <david.weinehall@nokia.com>
 # Modified by: Ilya Dogolazky, Tuomo Tanskanen
 
-INSTALL_DIR := install -d
-INSTALL_DATA := install -o root -g root --mode=644
+# ----------------------------------------------------------------------------
+# TOP LEVEL TARGETS
+# ----------------------------------------------------------------------------
 
-DOXYGEN := doxygen
+.PHONY: build doc install clean distclean mostlyclean
 
-PCDIR := $(DESTDIR)/usr/lib/pkgconfig
-INCLUDEDIR := $(DESTDIR)/usr/include/mce
+build::
 
-TOPDIR := $(shell /bin/pwd)
-INCDIR := $(TOPDIR)/include/mce
-DOCDIR := $(TOPDIR)/doc
+doc::
 
-PCFILE  := mce.pc
-INCLUDE_FILES := $(INCDIR)/dbus-names.h $(INCDIR)/mode-names.h
+install::
 
-.PHONY: doc
-doc:	doc/warnings
+mostlyclean::
+	$(RM) *.bak *~
+	$(RM) mce/include/*.bak mce/include/*~
 
-doc/warnings: $(INCLUDE_FILES) Doxyfile
-	@if [ ! -d "$(DOCDIR)" ]; then mkdir "$(DOCDIR)"; fi
-	@$(DOXYGEN) 2> $(TOPDIR)/doc/warnings > /dev/null
+clean:: mostlyclean
 
-clean:
-	@if [ x"$(DOCDIR)" != x"" ]; then	\
-		rm -rf "$(DOCDIR)";		\
-	fi
+distclean:: clean
 
-.PHONY: install
-install: doc
-	$(INSTALL_DIR) $(PCDIR) $(INCLUDEDIR)				&&\
-	$(INSTALL_DATA) $(PCFILE) $(PCDIR)				&&\
-	$(INSTALL_DATA) $(INCLUDE_FILES) $(INCLUDEDIR)
+# ----------------------------------------------------------------------------
+# INSTALL CONFIG
+# ----------------------------------------------------------------------------
 
-.PHONY: distclean
-distclean: clean
+DESTDIR    ?= /tmp/test-mce-dev
+
+PCDIR      ?= /usr/lib/pkgconfig
+INCLUDEDIR := /usr/include/mce
+
+INSTALL_DIR  := install -m 755 -d
+INSTALL_DATA := install -m 644
+
+
+# ----------------------------------------------------------------------------
+# FILES TO BUILD / INSTALL
+# ----------------------------------------------------------------------------
+
+PCFILE  += mce.pc
+INCLUDE_FILES += include/mce/dbus-names.h
+INCLUDE_FILES += include/mce/mode-names.h
+
+# ----------------------------------------------------------------------------
+# DOCUMENTATION RULES
+# ----------------------------------------------------------------------------
+
+doc::	doc/doxygen.log
+
+doc/doxygen.log: $(INCLUDE_FILES) Doxyfile
+	mkdir -p doc
+	doxygen 1> $@ # stdout=noise stderr=warnings
+
+clean::
+	$(RM) -rf doc
+
+# ----------------------------------------------------------------------------
+# INSTALL RULES
+# ----------------------------------------------------------------------------
+
+install::
+	# package config files
+	$(INSTALL_DIR) $(DESTDIR)$(PCDIR)
+	$(INSTALL_DATA) $(PCFILE) $(DESTDIR)$(PCDIR)/
+	# header files
+	$(INSTALL_DIR) $(DESTDIR)$(INCLUDEDIR)
+	$(INSTALL_DATA) $(INCLUDE_FILES) $(DESTDIR)$(INCLUDEDIR)

debian/changelog

@@ -1,3 +1,151 @@
+mce-dev (1.32.0) unstable; urgency=low
+
+  * [mce] Add charging suspendable dbus constant. JB#59152
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Tue, 22 Nov 2022 14:22:52 +0200
+
+mce-dev (1.31.0) unstable; urgency=low
+
+  * [mce] Add forced charging D-Bus constants. JB#58372
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Tue, 18 Oct 2022 10:47:06 +0300
+
+mce-dev (1.30.0) unstable; urgency=low
+
+  * [mce] Add charging hysteresis state D-Bus constants. JB#40062
+
+ -- Simo Piiroinen <simo.piiroinen@jolla.com>  Tue, 22 Feb 2022 04:19:53 +0200
+
+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
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 25 Jun 2019 10:11:01 +0300
+
+mce-dev (1.26.0) unstable; urgency=low
+
+  * [mce] Add D-Bus constants for button backlight mode. JB#42094
+  * [mce] Add missing Doxygen group name tag
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 20 Nov 2018 12:42:26 +0200
+
+mce-dev (1.25.0) unstable; urgency=low
+
+  * [mce] Add blanking pause related D-Bus constants. JB#41340
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Tue, 20 Mar 2018 10:07:37 +0200
+
+mce-dev (1.24.0) unstable; urgency=low
+
+  * [rpmbuild] Use _smp_mflags instead of jobs macro
+  * [makefile] Do not silence doxygen warnings
+  * [doxygen] Remove obsolete settings that cause warnings
+  * [doxygen] Do not sort member docs
+  * [doxygen] Do not scan the whole source tree
+  * [mce] Add missing methods and signals. MER#1854
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Fri, 24 Nov 2017 12:08:00 +0200
+
+mce-dev (1.23.0) unstable; urgency=low
+
+  * [mce] Add button backlight policy related D-Bus constants. JB#39838
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Fri, 06 Oct 2017 06:35:37 +0300
+
+mce-dev (1.22.0) unstable; urgency=low
+
+  * [mce] Add input policy related D-Bus constants. JB#38001
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 10 Apr 2017 15:22:37 +0300
+
+mce-dev (1.21.0) unstable; urgency=low
+
+  * [mce] Expose battery/charging data on D-Bus. Contributes to JB#37422
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 23 Jan 2017 11:58:37 +0200
+
+mce-dev (1.20.0) unstable; urgency=low
+
+  * [mce] Add method call for getting all mce settings. JB#34813
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Thu, 10 Nov 2016 08:27:14 +0200
+
+mce-dev (1.19.0) unstable; urgency=low
+
+  * [powerkey] Add method for ignoring incoming call. JB#20728
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Wed, 04 May 2016 12:54:34 +0300
+
+mce-dev (1.18.0) unstable; urgency=low
+
+  * [powerkey] Add constants for powerkey events. Fixes MER#1310
+
+ -- Simo Piiroinen <simo.piiroinen@jollamobile.com>  Mon, 14 Sep 2015 11:44:27 +0300
+
+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.

mce.pc

@@ -3,7 +3,7 @@ includedir=${prefix}/include
 
 Name: mce
 Description: Mode Control Entity
-Version: 1.14.0
+Version: 1.32.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,18 @@
-# 
-# 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.14.0
+Version:    1.32.0
 Release:    1
 Group:      Development/Libraries
 License:    LGPLv2
-URL:        https://github.com/nemomobile/mce-dev
+URL:        https://git.sailfishos.org/mer-core/mce-dev
 Source0:    %{name}-%{version}.tar.bz2
-Source100:  mce-headers.yaml
-Patch0:     %{name}-1.10.24-no-ownership.patch
+BuildArch:  noarch
 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 +22,27 @@ 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
+./verify_version
+make %{?_smp_mflags}
 make doc
-# << build post
 
 %install
 rm -rf %{buildroot}
-# >> install pre
-# << install pre
-%make_install
-
-# >> install post
+make install PCDIR=%{_libdir}/pkgconfig DESTDIR=%{?buildroot}
 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.14.0
-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

@@ -8,34 +8,33 @@ 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:]]*//')
+RPM_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-mce-headers}.spec
+RPM_VERS=$(grep '^Version:' $RPM_PATH |sed -e 's/^.*:[[:space:]]*//')
 
-YAML_PATH=${RPM_SOURCE_DIR:-rpm}/${RPM_PACKAGE_NAME:-mce-headers}.yaml
+# Remove initial part of rpm version  that equals with version from pkgconfig
+RPM_XTRA=${RPM_VERS#$PC_VERS}
+# From that remove initial part that equals with version from spec-file
+RPM_XTRA=${RPM_XTRA#$RPM_VERS}
+# If the result is non-empty string, then OBS is doing
+# delta-after-matching-tag kind of build, which is ok.
+# But empty string means that spec and Makefile are completely
+# out of sync, which is bad.
 
 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"
+if [ "$RPM_VERS" != "$PC_VERS" ]; then
+  if [ -z "$RPM_XTRA" ]; then
+    echo >&2 "$PC_PATH $PC_VERS vs $RPM_PATH $RPM_VERS"
     RES=1
+  else
+    echo "(ignoring patch level in spec file: $RPM_XTRA)"
+  fi
 fi
-
 
 if [ $RES != 0 ]; then
   echo >&2 "Conflicting package versions"