This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/cgit.cgi/v4l-utils.git tree:
Subject: v4l-utils: fix @PACKAGE_VERSION@ use Author: Hans Verkuil <hverkuil-ci...@xs4all.nl> Date: Wed Dec 13 10:25:30 2023 +0100 Man pages used @PACKAGE_VERSION@ which is supposed to be replaced by the v4l-utils version (e.g. 1.27.0), instead it was replaced by "1.27.0", i.e. including the double quotes. That messed up the man pages. It's now replaced by @MAN_PACKAGE_VERSION@ with is the same version, but without the double quotes. This was also a problem in lib/include/libdvbv5/libdvb-version.h.in where additional quotes where added. Those are now dropped. Signed-off-by: Hans Verkuil <hverkuil-ci...@xs4all.nl> lib/include/libdvbv5/libdvb-version.h.in | 2 +- meson.build | 1 + utils/cec-compliance/cec-compliance.1.in | 2 +- utils/cec-ctl/cec-ctl.1.in | 2 +- utils/cec-follower/cec-follower.1.in | 2 +- utils/dvb/dvb-fe-tool.1.in | 2 +- utils/dvb/dvb-format-convert.1.in | 2 +- utils/dvb/dvbv5-scan.1.in | 2 +- utils/dvb/dvbv5-zap.1.in | 2 +- utils/ir-ctl/ir-ctl.1.in | 2 +- utils/keytable/ir-keytable.1.in | 2 +- utils/keytable/rc_keymap.5.in | 2 +- utils/qv4l2/qv4l2.1.in | 2 +- utils/qvidcap/qvidcap.1.in | 2 +- utils/v4l2-compliance/v4l2-compliance.1.in | 2 +- utils/v4l2-ctl/v4l2-ctl.1.in | 2 +- utils/v4l2-tracer/v4l2-tracer.1.in | 2 +- 17 files changed, 17 insertions(+), 16 deletions(-) --- http://git.linuxtv.org/cgit.cgi/v4l-utils.git/commit/?id=5e743c3ada16b04997cfe07502df829405dfbb1b diff --git a/lib/include/libdvbv5/libdvb-version.h.in b/lib/include/libdvbv5/libdvb-version.h.in index ff950e588cd3..e00b2bef02df 100644 --- a/lib/include/libdvbv5/libdvb-version.h.in +++ b/lib/include/libdvbv5/libdvb-version.h.in @@ -1,4 +1,4 @@ #define LIBDVBV5_VERSION_MAJOR @MAJOR@ #define LIBDVBV5_VERSION_MINOR @MINOR@ #define LIBDVBV5_VERSION_PATCH @PATCH@ -#define LIBDVBV5_VERSION "@PACKAGE_VERSION@" +#define LIBDVBV5_VERSION @PACKAGE_VERSION@ diff --git a/meson.build b/meson.build index 03508bc8f7ed..3196d9a79f0a 100644 --- a/meson.build +++ b/meson.build @@ -36,6 +36,7 @@ conf = configuration_data() conf.set_quoted('PACKAGE', meson.project_name()) conf.set_quoted('PACKAGE_VERSION', as_version) conf.set_quoted('V4L_UTILS_VERSION', as_version) +conf.set('MAN_PACKAGE_VERSION', as_version) conf.set('MAJOR', as_major_version) conf.set('MINOR', as_minor_version) conf.set('PATCH', as_patch_version) diff --git a/utils/cec-compliance/cec-compliance.1.in b/utils/cec-compliance/cec-compliance.1.in index 946548582513..fadeebb638d4 100644 --- a/utils/cec-compliance/cec-compliance.1.in +++ b/utils/cec-compliance/cec-compliance.1.in @@ -1,4 +1,4 @@ -.TH "CEC-COMPLIANCE" "1" "August 2016" "v4l-utils @PACKAGE_VERSION@" "User Commands" +.TH "CEC-COMPLIANCE" "1" "August 2016" "v4l-utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME cec-compliance - An application to verify remote CEC devices .SH SYNOPSIS diff --git a/utils/cec-ctl/cec-ctl.1.in b/utils/cec-ctl/cec-ctl.1.in index f2be87ada755..357c111c84e1 100644 --- a/utils/cec-ctl/cec-ctl.1.in +++ b/utils/cec-ctl/cec-ctl.1.in @@ -1,4 +1,4 @@ -.TH "CEC-CTL" "1" "August 2016" "v4l-utils @PACKAGE_VERSION@" "User Commands" +.TH "CEC-CTL" "1" "August 2016" "v4l-utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME cec-ctl - An application to control cec devices .SH SYNOPSIS diff --git a/utils/cec-follower/cec-follower.1.in b/utils/cec-follower/cec-follower.1.in index 64a0968f99d2..82433486f498 100644 --- a/utils/cec-follower/cec-follower.1.in +++ b/utils/cec-follower/cec-follower.1.in @@ -1,4 +1,4 @@ -.TH "CEC-FOLLOWER" "1" "August 2016" "v4l-utils @PACKAGE_VERSION@" "User Commands" +.TH "CEC-FOLLOWER" "1" "August 2016" "v4l-utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME cec-follower - An application to emulate CEC followers .SH SYNOPSIS diff --git a/utils/dvb/dvb-fe-tool.1.in b/utils/dvb/dvb-fe-tool.1.in index d5c4821fab09..b17386329def 100644 --- a/utils/dvb/dvb-fe-tool.1.in +++ b/utils/dvb/dvb-fe-tool.1.in @@ -1,4 +1,4 @@ -.TH "dvb-fe-tool" 1 "Fri Oct 3 2014" "DVBv5 Utils @PACKAGE_VERSION@" "User Commands" +.TH "dvb-fe-tool" 1 "Fri Oct 3 2014" "DVBv5 Utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME dvb\-fe\-tool \- DVBv5 tool for frontend settings inspect/change .SH SYNOPSIS diff --git a/utils/dvb/dvb-format-convert.1.in b/utils/dvb/dvb-format-convert.1.in index aae3e157f898..3343258f8216 100644 --- a/utils/dvb/dvb-format-convert.1.in +++ b/utils/dvb/dvb-format-convert.1.in @@ -1,4 +1,4 @@ -.TH "dvb-format-convert" 1 "Fri Oct 3 2014" "DVBv5 Utils @PACKAGE_VERSION@" "User Commands" +.TH "dvb-format-convert" 1 "Fri Oct 3 2014" "DVBv5 Utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME dvb-format-convert \- DVBv5 tool for file format conversions .SH SYNOPSIS diff --git a/utils/dvb/dvbv5-scan.1.in b/utils/dvb/dvbv5-scan.1.in index e6fe3eee790e..af6f25f8b426 100644 --- a/utils/dvb/dvbv5-scan.1.in +++ b/utils/dvb/dvbv5-scan.1.in @@ -1,4 +1,4 @@ -.TH "dvbv5-scan" 1 "Fri Oct 3 2014" "DVBv5 Utils @PACKAGE_VERSION@" "User Commands" +.TH "dvbv5-scan" 1 "Fri Oct 3 2014" "DVBv5 Utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME dvbv5-scan \- DVBv5 tool for frequency scanning .SH SYNOPSIS diff --git a/utils/dvb/dvbv5-zap.1.in b/utils/dvb/dvbv5-zap.1.in index 98b294b8e9f7..046c81896653 100644 --- a/utils/dvb/dvbv5-zap.1.in +++ b/utils/dvb/dvbv5-zap.1.in @@ -1,4 +1,4 @@ -.TH "dvbv5-zap" 1 "Fri Oct 3 2014" "DVBv5 Utils @PACKAGE_VERSION@" "User Commands" +.TH "dvbv5-zap" 1 "Fri Oct 3 2014" "DVBv5 Utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME dvbv5\-zap \- DVBv5 tool for service tuning .SH SYNOPSIS diff --git a/utils/ir-ctl/ir-ctl.1.in b/utils/ir-ctl/ir-ctl.1.in index 4b5994189446..f1ed2640af02 100644 --- a/utils/ir-ctl/ir-ctl.1.in +++ b/utils/ir-ctl/ir-ctl.1.in @@ -1,4 +1,4 @@ -.TH "IR\-CTL" "1" "Tue Jul 5 2016" "v4l-utils @PACKAGE_VERSION@" "User Commands" +.TH "IR\-CTL" "1" "Tue Jul 5 2016" "v4l-utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME ir\-ctl \- a swiss\-knife tool to handle raw IR and to set lirc options .SH SYNOPSIS diff --git a/utils/keytable/ir-keytable.1.in b/utils/keytable/ir-keytable.1.in index 06e7d738a154..75e39a52ea8e 100644 --- a/utils/keytable/ir-keytable.1.in +++ b/utils/keytable/ir-keytable.1.in @@ -1,4 +1,4 @@ -.TH "IR\-KEYTABLE" "1" "Fri Oct 3 2014" "v4l-utils @PACKAGE_VERSION@" "User Commands" +.TH "IR\-KEYTABLE" "1" "Fri Oct 3 2014" "v4l-utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME ir\-keytable \- a swiss\-knife tool to handle Remote Controllers. .SH SYNOPSIS diff --git a/utils/keytable/rc_keymap.5.in b/utils/keytable/rc_keymap.5.in index 4c3da8342692..aacd4d42dc54 100644 --- a/utils/keytable/rc_keymap.5.in +++ b/utils/keytable/rc_keymap.5.in @@ -1,4 +1,4 @@ -.TH "RC_KEYMAP" "5" "Thu Mar 7 2019" "v4l-utils @PACKAGE_VERSION@" "File Formats" +.TH "RC_KEYMAP" "5" "Thu Mar 7 2019" "v4l-utils @MAN_PACKAGE_VERSION@" "File Formats" .SH NAME rc_keymap \- toml file describing remote control keymap .SH DESCRIPTION diff --git a/utils/qv4l2/qv4l2.1.in b/utils/qv4l2/qv4l2.1.in index 08a69ecf3742..b8612f3a05d8 100644 --- a/utils/qv4l2/qv4l2.1.in +++ b/utils/qv4l2/qv4l2.1.in @@ -1,4 +1,4 @@ -.TH "QV4L2" "1" "March 2015" "v4l-utils @PACKAGE_VERSION@" "User Commands" +.TH "QV4L2" "1" "March 2015" "v4l-utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME qv4l2 - A test bench application for video4linux devices .SH SYNOPSIS diff --git a/utils/qvidcap/qvidcap.1.in b/utils/qvidcap/qvidcap.1.in index 10f6fab248fc..e133f1e87fe6 100644 --- a/utils/qvidcap/qvidcap.1.in +++ b/utils/qvidcap/qvidcap.1.in @@ -1,4 +1,4 @@ -.TH "QVIDCAP" "1" "June 2016" "v4l-utils @PACKAGE_VERSION@" "User Commands" +.TH "QVIDCAP" "1" "June 2016" "v4l-utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME qvidcap - A v4l2 video capture viewer .SH SYNOPSIS diff --git a/utils/v4l2-compliance/v4l2-compliance.1.in b/utils/v4l2-compliance/v4l2-compliance.1.in index 89d7e48253ba..fa12ae2d89b4 100644 --- a/utils/v4l2-compliance/v4l2-compliance.1.in +++ b/utils/v4l2-compliance/v4l2-compliance.1.in @@ -1,4 +1,4 @@ -.TH "V4L2-COMPLIANCE" "1" "March 2015" "v4l-utils @PACKAGE_VERSION@" "User Commands" +.TH "V4L2-COMPLIANCE" "1" "March 2015" "v4l-utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME v4l2-compliance - An application to test video4linux drivers .SH SYNOPSIS diff --git a/utils/v4l2-ctl/v4l2-ctl.1.in b/utils/v4l2-ctl/v4l2-ctl.1.in index 40817a82e599..b7e417406f32 100644 --- a/utils/v4l2-ctl/v4l2-ctl.1.in +++ b/utils/v4l2-ctl/v4l2-ctl.1.in @@ -1,4 +1,4 @@ -.TH "V4L2-CTL" "1" "March 2015" "v4l-utils @PACKAGE_VERSION@" "User Commands" +.TH "V4L2-CTL" "1" "March 2015" "v4l-utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME v4l2-ctl - An application to control video4linux drivers .SH SYNOPSIS diff --git a/utils/v4l2-tracer/v4l2-tracer.1.in b/utils/v4l2-tracer/v4l2-tracer.1.in index 13942eba0e83..419e8a368f04 100644 --- a/utils/v4l2-tracer/v4l2-tracer.1.in +++ b/utils/v4l2-tracer/v4l2-tracer.1.in @@ -1,4 +1,4 @@ -.TH "V4L2-TRACER" "1" "November 2022" "v4l-utils @PACKAGE_VERSION@" "User Commands" +.TH "V4L2-TRACER" "1" "November 2022" "v4l-utils @MAN_PACKAGE_VERSION@" "User Commands" .SH NAME v4l2-tracer - An application to trace and replay stateless video decoding. .SH SYNOPSIS _______________________________________________ linuxtv-commits mailing list linuxtv-commits@linuxtv.org https://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
