From 7521e5b5db67f32121005d563c20849170e6c431 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 1 Sep 2023 13:00:47 +0200 Subject: [PATCH 1/8] NEWS: Add missing contributors for 0.2.1 --- NEWS | 2 ++ 1 file changed, 2 insertions(+) diff --git a/NEWS b/NEWS index 721f155..cbc68c3 100644 --- a/NEWS +++ b/NEWS @@ -2,6 +2,8 @@ feedback 0.2.1 -------------- Released August 2023 * Minor documentation updates +* Contributors: + * Guido Günther feedback 0.2.0 -------------- From 5f9d576de89667c18d9a04e616afe2edcd214121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 1 Sep 2023 13:00:48 +0200 Subject: [PATCH 2/8] gitignore gir package --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index 0b0ad53..505f5f7 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ debian/*.debhelper.log debian/*.substvars debian/feedbackd/ debian/feedbackd-common/ +debian/gir1.2-lfb-0.0/ debian/libfeedback-0.0-0.substvars debian/libfeedback-0.0-0/ debian/libfeedback-dev.substvars From b96a25394b8505087142ec3186a580f3af27c0d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 1 Sep 2023 13:00:49 +0200 Subject: [PATCH 3/8] feedback-themes: Improve wording --- doc/feedback-themes.rst | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/doc/feedback-themes.rst b/doc/feedback-themes.rst index ef5528e..6006ed5 100644 --- a/doc/feedback-themes.rst +++ b/doc/feedback-themes.rst @@ -12,16 +12,15 @@ DESCRIPTION =========== In order to reflect device specifics and user overrides the feedback -(such as sound, haptic or led) that are being triggered by events can -be configured. This allows for device as well as user specific -configuration. Themes use a json format and can be validated by -``fbd-theme-validate``. +(such as sound, haptic or led) that is being triggered by an event can +be configured and overridden by so called themes. Feedback themes use a JSON +format that can be validated with ``fbd-theme-validate``. For details on how to create or modify feedback themes see [feedbackd's documentation]( -https://source.puri.sm/Librem5/feedbackd#feedback-theme) +https://source.puri.sm/Librem5/feedbackd#feedback-theme). -Sound events -============ +Sound feedback +============== Sound feedbacks specify an event name from a XDG sound theme. Sound themes are described in the [Sound theme spec](https://freedesktop.org/wiki/Specifications/sound-theme-spec/). From 93dab70f2428bd4915750e0b9884d617d03a6546 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 1 Sep 2023 13:00:49 +0200 Subject: [PATCH 4/8] manpages: Improve references --- doc/fbd-theme-validate.rst | 2 +- doc/feedbackd.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/fbd-theme-validate.rst b/doc/fbd-theme-validate.rst index c32391c..cdeda29 100644 --- a/doc/fbd-theme-validate.rst +++ b/doc/fbd-theme-validate.rst @@ -53,4 +53,4 @@ Validate the device theme for a OnePlus 6T: See also ======== -``feedbackd(8)`` ``fbcli(1)`` +``feedbackd(8)`` ``fbcli(1)`` ``feedback-themes`` diff --git a/doc/feedbackd.rst b/doc/feedbackd.rst index ed03a27..0f2d191 100644 --- a/doc/feedbackd.rst +++ b/doc/feedbackd.rst @@ -39,4 +39,4 @@ Options See also ======== -``fbcli(1)`` ``fbd-theme-validate(1)`` ``feedback-themes(5)`` ``feedback-themes(5)`` +``fbcli(1)`` ``fbd-theme-validate(1)`` ``feedback-themes(5)`` From 48b5ca547f7b9ce713ab74cbc18fc8552e40229b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 1 Sep 2023 13:05:10 +0200 Subject: [PATCH 5/8] manpages: Fix whatis entry --- doc/feedback-themes.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/feedback-themes.rst b/doc/feedback-themes.rst index 6006ed5..203f550 100644 --- a/doc/feedback-themes.rst +++ b/doc/feedback-themes.rst @@ -1,7 +1,7 @@ .. _feedback-themes(5): =============== -feedback themes +feedback-themes =============== --------------------------------- From b20f08c0303c040493ef8331adf8dc36e802f4ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 1 Sep 2023 13:00:51 +0200 Subject: [PATCH 6/8] debian: Update from the current packaging in Debian - Validate fbd-theme-validate - Add Build-dep to symbols file - Add doc-base registration - Use dh_installman to fix nodoc build - Update debian/copyright - Improve Recommends: and multi arch annotations - Add lintian overrides --- debian/control | 12 +++++++++--- debian/copyright | 19 +++++++++++++++++-- debian/feedbackd.install | 1 - debian/feedbackd.lintian-overrides | 1 + debian/feedbackd.manpages | 4 ++++ debian/libfeedback-0.0-0.symbols | 1 + debian/libfeedback-dev.doc-base | 12 ++++++++++++ debian/libfeedback-dev.lintian-overrides | 1 + debian/tests/control | 5 +++++ 9 files changed, 50 insertions(+), 6 deletions(-) create mode 100644 debian/feedbackd.lintian-overrides create mode 100644 debian/feedbackd.manpages create mode 100644 debian/libfeedback-dev.doc-base create mode 100644 debian/libfeedback-dev.lintian-overrides diff --git a/debian/control b/debian/control index 1e14235..100e5ad 100644 --- a/debian/control +++ b/debian/control @@ -4,21 +4,21 @@ Priority: optional Maintainer: Guido Günther Build-Depends: dbus, - debhelper-compat (= 12), + debhelper-compat (= 13), dh-sequence-gir, gsettings-desktop-schemas , gi-docgen , json-glib-tools, libgirepository1.0-dev, libglib2.0-dev, - libgudev-1.0-dev (>= 232), + libgudev-1.0-dev, libgsound-dev, libjson-glib-dev, meson, pkg-config, python3-docutils , valac, -Standards-Version: 4.4.0 +Standards-Version: 4.6.2 Homepage: https://source.puri.sm/Librem5/feedbackd Package: feedbackd @@ -28,6 +28,8 @@ Depends: ${shlibs:Depends}, feedbackd-common (>= ${source:Version}), sound-theme-freedesktop, +Recommends: + gsettings-desktop-schemas, Description: DBus service for haptic/visual/audio feedback Feedbackd is a DBus activated daemon that provides haptic/ visual/audio feedback based on events. @@ -51,10 +53,12 @@ Description: Shared files for feedbackd Package: libfeedback-0.0-0 Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, ${shlibs:Depends}, +Recommends: feedbackd (>= ${binary:Version}) Description: Library for managing haptic/visual/audio feedback Feedbackd is a DBus activated daemon that provides haptic/ visual/audio feedback based on events. @@ -64,6 +68,7 @@ Description: Library for managing haptic/visual/audio feedback Package: libfeedback-dev Architecture: any +Multi-Arch: same Section: libdevel Depends: gir1.2-lfb-0.0 (= ${binary:Version}), @@ -80,6 +85,7 @@ Description: Development files for libfeedback Package: gir1.2-lfb-0.0 Architecture: any +Multi-Arch: same Section: introspection Depends: ${gir:Depends}, diff --git a/debian/copyright b/debian/copyright index 115b353..777a827 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,9 +1,26 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: feedbackd +Upstream-Contact: Guido Günther Source: https://source.puri.sm/Librem5/feedbackd Files: * Copyright: 2020 Purism SPC +License: GPL-3+ + +Files: debian/* +Copyright: + 2020 Purism SPC + 2020 Arnaud Ferraris +License: GPL-3+ + +Files: debian/feedbackd.udev +Copyright: 2020 Purism SPC +License: LGPL-2.1+ + +Files: libfeedback/* +Copyright: 2020 Purism SPC +License: LGPL-2.1+ + License: GPL-3+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -21,8 +38,6 @@ License: GPL-3+ On Debian systems, the complete text of the GNU General Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -Files: libfeedback/* -Copyright: 2020 Purism SPC License: LGPL-2.1+ This package is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by diff --git a/debian/feedbackd.install b/debian/feedbackd.install index 97b1d10..732f8bd 100644 --- a/debian/feedbackd.install +++ b/debian/feedbackd.install @@ -2,4 +2,3 @@ /usr/libexec/ /usr/share/dbus-1/ /usr/share/feedbackd/ -/usr/share/man/ diff --git a/debian/feedbackd.lintian-overrides b/debian/feedbackd.lintian-overrides new file mode 100644 index 0000000..4cf33ce --- /dev/null +++ b/debian/feedbackd.lintian-overrides @@ -0,0 +1 @@ +feedbackd: appstream-metadata-missing-modalias-provide lib/udev/rules.d/90-feedbackd.rules diff --git a/debian/feedbackd.manpages b/debian/feedbackd.manpages new file mode 100644 index 0000000..7a78900 --- /dev/null +++ b/debian/feedbackd.manpages @@ -0,0 +1,4 @@ +/usr/share/man/man1/fbcli.1 +/usr/share/man/man1/fbd-theme-validate.1 +/usr/share/man/man5/feedback-themes.5 +/usr/share/man/man8/feedbackd.8 diff --git a/debian/libfeedback-0.0-0.symbols b/debian/libfeedback-0.0-0.symbols index fc1d6d6..114ab85 100644 --- a/debian/libfeedback-0.0-0.symbols +++ b/debian/libfeedback-0.0-0.symbols @@ -1,4 +1,5 @@ libfeedback-0.0.so.0 libfeedback-0.0-0 #MINVER# +* Build-Depends-Package: libfeedback-dev LIBFEEDBACK_0_0_0@LIBFEEDBACK_0_0_0 0.1.1 lfb_event_end_feedback@LIBFEEDBACK_0_0_0 0.1.1 lfb_event_end_feedback_async@LIBFEEDBACK_0_0_0 0.1.1 diff --git a/debian/libfeedback-dev.doc-base b/debian/libfeedback-dev.doc-base new file mode 100644 index 0000000..a8d9780 --- /dev/null +++ b/debian/libfeedback-dev.doc-base @@ -0,0 +1,12 @@ +Document: libfeedback +Title: libfeedback Reference Manual +Author: Guido Günther +Abstract: A library to trigger feedback (such as haptic feedback) + from your application. This document covers the C API, + but it also useful for GObject introspection bindings + of your favourite programming language. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libfeedback-dev/libfeedback-0/index.html +Files: /usr/share/doc/libfeedback-dev/libfeedback-0/*.html diff --git a/debian/libfeedback-dev.lintian-overrides b/debian/libfeedback-dev.lintian-overrides new file mode 100644 index 0000000..154a0d1 --- /dev/null +++ b/debian/libfeedback-dev.lintian-overrides @@ -0,0 +1 @@ +libfeedback-dev: privacy-breach-facebook diff --git a/debian/tests/control b/debian/tests/control index ef4a959..71e677b 100644 --- a/debian/tests/control +++ b/debian/tests/control @@ -11,3 +11,8 @@ Depends: python3, python3-gi, Restrictions: allow-stderr, superficial + +Test-Command: fbd-theme-validate /usr/share/feedbackd/themes/default.json +Depends: + feedbackd +Restrictions: superficial From 708abf1e4ad83ca8be49502b3bfbfe8f27492f6d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 1 Sep 2023 13:00:51 +0200 Subject: [PATCH 7/8] debian: Fix nodoc build Don't try to install the dev docs in that case. --- debian/libfeedback-dev.docs | 1 + debian/libfeedback-dev.install | 1 - debian/rules | 11 +++++++++++ 3 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 debian/libfeedback-dev.docs diff --git a/debian/libfeedback-dev.docs b/debian/libfeedback-dev.docs new file mode 100644 index 0000000..8f7fc3b --- /dev/null +++ b/debian/libfeedback-dev.docs @@ -0,0 +1 @@ +usr/share/doc/libfeedback-dev/libfeedback-0/ diff --git a/debian/libfeedback-dev.install b/debian/libfeedback-dev.install index e07f1b2..4a59b17 100644 --- a/debian/libfeedback-dev.install +++ b/debian/libfeedback-dev.install @@ -1,6 +1,5 @@ /usr/include /usr/share/gir-1.0/ -/usr/share/doc/libfeedback-0 /usr/share/doc/libfeedback-dev/ /usr/share/vala/ /usr/lib/*/libfeedback-*.so /usr/lib/*/pkgconfig/libfeedback-*.pc diff --git a/debian/rules b/debian/rules index e32ed5b..6c773f0 100755 --- a/debian/rules +++ b/debian/rules @@ -10,9 +10,20 @@ ifeq (,$(filter nodoc,$(DEB_BUILD_PROFILES))) CONFIGURE_OPTS += -Dgtk_doc=true -Dman=true endif +COMMON_PKG=feedbackd-common + +docroot := $(CURDIR)/debian/tmp/usr/share/doc/ + %: dh $@ --builddirectory=_build +override_dh_installdocs: +ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),) + mkdir -p $(docroot)/libfeedback-dev/libfeedback-0 + mv $(docroot)/libfeedback-0 $(docroot)/libfeedback-dev/ +endif + dh_installdocs + override_dh_auto_configure: dh_auto_configure -- $(CONFIGURE_OPTS) From 3b970ef34b5527cf0ef0a7fd669b5e79458bce7d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Guido=20G=C3=BCnther?= Date: Fri, 1 Sep 2023 13:00:52 +0200 Subject: [PATCH 8/8] debian: Install NEWS --- debian/rules | 1 + 1 file changed, 1 insertion(+) diff --git a/debian/rules b/debian/rules index 6c773f0..51b4929 100755 --- a/debian/rules +++ b/debian/rules @@ -18,6 +18,7 @@ docroot := $(CURDIR)/debian/tmp/usr/share/doc/ dh $@ --builddirectory=_build override_dh_installdocs: + dh_installdocs -p$(COMMON_PKG) NEWS ifeq ($(filter nodoc,$(DEB_BUILD_PROFILES)),) mkdir -p $(docroot)/libfeedback-dev/libfeedback-0 mv $(docroot)/libfeedback-0 $(docroot)/libfeedback-dev/