Commit 762f3509 authored by Guido Günther's avatar Guido Günther
Browse files

Merge branch 'a-wai/0.0.0+git20200707' into 'debian/master'

Package upstream release 0.0.0+git20200707

See merge request DebianOnMobile-team/feedbackd!4
parents 48dff5da af96819b
feedbackd (0.0.0+git20200707-1) unstable; urgency=medium
[ Guido Günther ]
* d/control: Add myself as uploader
* debian: Ship manpages
* debian: Setup leds via udev.
This allows feedbackd to set periodic feedback and makes usable
LED devices identifiable by feedbackd.
[ Arnaud Ferraris ]
* New upstream version 0.0.0+git20200707
* d/patches: remove custom manpage
Upstream created a manpage for this package, we don't need to provide
our own anymore.
* debian: add missing symbols
* d/patches: fix typos and manpage
Fixes: lintian: bad-whatis-entry
Fixes: lintian: spelling-error-in-binary
Fixes: lintian: typo-in-manual-page
-- Arnaud Ferraris <arnaud.ferraris@gmail.com> Sun, 12 Jul 2020 16:44:45 +0200
feedbackd (0.0.0+git20200527-1) unstable; urgency=medium
[ Federico Ceratto ]
......
......@@ -7,10 +7,12 @@ libfeedback-0.0.so.0 libfeedback-0.0-0 #MINVER#
lfb_event_end_reason_get_type@LIBFEEDBACK_0_0_0 0.0.0+git20200305
lfb_event_get_end_reason@LIBFEEDBACK_0_0_0 0.0.0+git20200305
lfb_event_get_event@LIBFEEDBACK_0_0_0 0.0.0+git20200305
lfb_event_get_feedback_profile@LIBFEEDBACK_0_0_0 0.0.0+git20200707
lfb_event_get_state@LIBFEEDBACK_0_0_0 0.0.0+git20200305
lfb_event_get_timeout@LIBFEEDBACK_0_0_0 0.0.0+git20200305
lfb_event_get_type@LIBFEEDBACK_0_0_0 0.0.0+git20200305
lfb_event_new@LIBFEEDBACK_0_0_0 0.0.0+git20200305
lfb_event_set_feedback_profile@LIBFEEDBACK_0_0_0 0.0.0+git20200707
lfb_event_set_timeout@LIBFEEDBACK_0_0_0 0.0.0+git20200305
lfb_event_state_get_type@LIBFEEDBACK_0_0_0 0.0.0+git20200305
lfb_event_trigger_feedback@LIBFEEDBACK_0_0_0 0.0.0+git20200305
......
From 4e1045e5525a415491af23be05428445f04b05b6 Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@collabora.com>
Date: Wed, 15 Apr 2020 11:55:03 +0200
Subject: [PATCH] cli: add and install manpage
---
cli/fbcli.1 | 42 ++++++++++++++++++++++++++++++++++++++++++
cli/meson.build | 2 ++
2 files changed, 44 insertions(+)
create mode 100644 cli/fbcli.1
diff --git a/cli/fbcli.1 b/cli/fbcli.1
new file mode 100644
index 0000000..193090d
--- /dev/null
+++ b/cli/fbcli.1
@@ -0,0 +1,42 @@
+.TH "FBCLI" "1" "04/14/2020" "fbcli 0\&.0\&.0\+git20200305" "feedbackd"
+.SH "NAME"
+fbcli \- Command\-line utility aimed at testing feedbackd
+.SH "SYNOPSIS"
+.HP \w'\fBfbcli\fR\ 'u
+\fBfbcli\fR [OPTION...]
+.SH "DESCRIPTION"
+.PP
+fbcli is a simple command\-line utility for feedbackd testing\&. It can be
+used to trigger specific events and check the appropriate feedback actions
+(play sound, vibrate...) are executed\&.
+.SH "OPTIONS"
+.SS "Help Options"
+.PP
+\fB\-h\fR, \fB\-\-help\fR
+.RS 4
+Show help
+.RE
+.SS "Application Options"
+.PP
+\fB\-E\fR, \fB\-\-event\fR
+.RS 4
+Event name (default: phone\-incoming\-call)\&.
+.RE
+.PP
+\fB\-t\fR, \fB\-\-timeout\fR
+.RS 4
+Run feedback for timeout seconds\&.
+.RE
+.PP
+\fB\-P\fR, \fB\-\-profile\fR
+.RS 4
+Profile name to set\&.
+.RE
+.PP
+\fB\-w\fR, \fB\-\-watch\fR
+.RS 4
+How long to watch for feedback longest\&.
+.RE
+.SH "AUTHORS"
+.PP
+\fBArnaud Ferraris\fR <\&arnaud\&.ferraris@collabora\&.com\&>
diff --git a/cli/meson.build b/cli/meson.build
index e542e1c..1b0c25e 100644
--- a/cli/meson.build
+++ b/cli/meson.build
@@ -14,3 +14,5 @@ executable(
dependencies: fbcli_deps,
install: true,
)
+
+install_man('fbcli.1')
--
2.25.1
From 145a6eb743d9b9932adb59832527756f2601a805 Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
Date: Sun, 12 Jul 2020 14:53:20 +0200
Subject: [PATCH 1/3] doc: fix typos
---
doc/fbcli.xml | 2 +-
doc/feedbackd.xml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/doc/fbcli.xml b/doc/fbcli.xml
index bdacf87..6bb6491 100644
--- a/doc/fbcli.xml
+++ b/doc/fbcli.xml
@@ -79,7 +79,7 @@ print help and exit
<term><option>-w=<replaceable>TIMEOUT</replaceable></option></term>
<term><option>--watch=<replaceable>TIMEOUT</replaceable></option></term>
<para>
- Maximum timout to wait for the feedback for the given event to end and
+ Maximum timeout to wait for the feedback for the given event to end and
<command>fbcli</command> to exit.
</para>
</varlistentry>
diff --git a/doc/feedbackd.xml b/doc/feedbackd.xml
index 85dbd37..adf42e8 100644
--- a/doc/feedbackd.xml
+++ b/doc/feedbackd.xml
@@ -37,7 +37,7 @@
a haptic motor or blink a LED.
</para>
<para>
- The feedback triggerd by a given event is determined by the feedback
+ The feedback triggered by a given event is determined by the feedback
them in use. Events are submitted via a DBus API. For details
refer to the event and feedback theme specs at
<ulink url="https://source.puri.sm/Librem5/feedbackd/"/>
--
2.27.0
From b770257fa454cd0b2a5273d268c447e2fc8ac407 Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
Date: Sun, 12 Jul 2020 14:54:27 +0200
Subject: [PATCH 2/3] doc: feedbackd: add short description
---
doc/feedbackd.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/doc/feedbackd.xml b/doc/feedbackd.xml
index adf42e8..994c587 100644
--- a/doc/feedbackd.xml
+++ b/doc/feedbackd.xml
@@ -20,7 +20,7 @@
<refnamediv>
<refname>feedbackd</refname>
-<refpurpose></refpurpose>
+<refpurpose>A daemon to provide feedback on events</refpurpose>
</refnamediv>
<refsynopsisdiv>
--
2.27.0
From dad11346b8bfd8b9a1aeaae6c816e9aa561bed03 Mon Sep 17 00:00:00 2001
From: Arnaud Ferraris <arnaud.ferraris@gmail.com>
Date: Sun, 12 Jul 2020 14:55:29 +0200
Subject: [PATCH 3/3] fbd-ledctrl: fix typo
---
src/fbd-ledctrl.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/src/fbd-ledctrl.c b/src/fbd-ledctrl.c
index b31ab43..9386403 100644
--- a/src/fbd-ledctrl.c
+++ b/src/fbd-ledctrl.c
@@ -177,7 +177,7 @@ int main(int argc, char *argv[])
return FBD_LEDCTRL_ERR_TRIGGER;
if (group) {
- g_debug ("Setting permision of %s to %s", sysfs_path, group);
+ g_debug ("Setting permission of %s to %s", sysfs_path, group);
if (!set_perms (sysfs_path, trigger, group))
return FBD_LEDCTRL_ERR_PERMS;
}
--
2.27.0
0001-cli-add-and-install-manpage.patch
0001-doc-fix-typos.patch
0002-doc-feedbackd-add-short-description.patch
0003-fbd-ledctrl-fix-typo.patch
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment