Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package plymouth for openSUSE:Factory checked in at 2023-07-16 17:18:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/plymouth (Old) and /work/SRC/openSUSE:Factory/.plymouth.new.3193 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "plymouth" Sun Jul 16 17:18:17 2023 rev:123 rq: version:22.02.122+94.4bd41a3 Changes: -------- --- /work/SRC/openSUSE:Factory/plymouth/plymouth.changes 2023-07-15 23:15:05.451490860 +0200 +++ /work/SRC/openSUSE:Factory/.plymouth.new.3193/plymouth.changes 2023-07-16 17:18:18.804222902 +0200 @@ -2,30 +1,0 @@ -Mon Jul 10 12:18:29 UTC 2023 - Cliff Zhao <[email protected]> - -- Update to 22.02.122+94.4bd41a3: - * Port build system to Meson; - * device-manager: Support kernels with CONFIG_VT=n; - * Fix terminal crash; - * terminal: Add API for flushing input buffer; - * device-manager: Only wait for device timeout for framebuffer devices; - * scripts: Update keymap-render script to handle xkb keymaps too; - * drm: Add support for new /dev/input feature; - * frame-buffer: Add support for new /dev/input feature; - * src: Hide console text when splash is requested; - * script: adds a new native GetCapslockState function to lib-plymouth; -- Add plymouth-adapts-xkbommon.patch: - xkbommon in openSUSE install to a specify location, this modify to make - plymouth adapt with it to build. -- Rebase plymouth-crash-avoid-on-keyboard-remove-input-handler.patch: - To fit with the update. -- Rebase plymouth-disable-fedora-logo.patch: - To fit with the update. -- Rebase plymouth-log-on-default.patch: - To fit with the update. -- Update plymouth.spec: - To fit with the update. - Make plymouth use Tumbleweed/Leap's logo instead of upstream's. -- Drop plymouth-manpages.patch: - openSUSE fix the problem in other side, "man 1 plymouth" and - "man 8 plymouth" all works withouth this patch (bnc#871419). - -------------------------------------------------------------------- Old: ---- plymouth-22.02.122+180.b1d5aa9.tar.xz plymouth-adapts-xkbommon.patch New: ---- plymouth-22.02.122+94.4bd41a3.tar.xz plymouth-manpages.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ plymouth.spec ++++++ --- /var/tmp/diff_new_pack.shlbic/_old 2023-07-16 17:18:19.732228453 +0200 +++ /var/tmp/diff_new_pack.shlbic/_new 2023-07-16 17:18:19.736228477 +0200 @@ -23,7 +23,7 @@ %global soversion 5 Name: plymouth -Version: 22.02.122+180.b1d5aa9 +Version: 22.02.122+94.4bd41a3 Release: 0 Summary: Graphical Boot Animation and Logger License: GPL-2.0-or-later @@ -34,26 +34,27 @@ Patch0: plymouth-dracut-path.patch # PATCH-FIX-OPENSUSE plymouth-some-greenish-openSUSE-colors.patch bnc#886148 [email protected] -- To use suse colors in tribar. Patch1: plymouth-some-greenish-openSUSE-colors.patch +# PATCH-FIX-UPSTREAM plymouth-manpages.patch bnc#871419 [email protected] -- Fix man page installation +Patch2: plymouth-manpages.patch # PATCH-FIX-OPENSUSE plymouth-disable-fedora-logo.patch [email protected] -- Disable the fedora logo reference which is not in openSUSE. -Patch2: plymouth-disable-fedora-logo.patch +Patch3: plymouth-disable-fedora-logo.patch # PATCH-FIX-OPENSUSE plymouth-only_use_fb_for_cirrus_bochs.patch bnc#888590 boo#1172028 bsc#1181913 [email protected] -- Force fb for cirrus and bochs, force drm otherwise. replace removal of framebuffer driver and plymouth-ignore-cirrusdrm.patch with single patch. -Patch3: plymouth-only_use_fb_for_cirrus_bochs.patch +Patch4: plymouth-only_use_fb_for_cirrus_bochs.patch # PATCH-FIX-OPENSUSE plymouth-keep-KillMode-none.patch bsc#1177082 bsc#1184087 boo#1182145 [email protected] -- Keep the plymouth-start.service KillMode=none. -Patch4: plymouth-keep-KillMode-none.patch +Patch5: plymouth-keep-KillMode-none.patch # PATCH-FIX-OPENSUSE plymouth-install-label-library-and-font-file-to-initrd.patch boo#1183425 boo#1184309 [email protected] -- Pack label plugin and font into initram to ensure notice info could successfully show when partition encrypted. -Patch5: plymouth-install-label-library-and-font-file-to-initrd.patch +Patch6: plymouth-install-label-library-and-font-file-to-initrd.patch # PATCH-FIX-OPENSUSE plymouth-quiet-dracut-build-info.patch bsc#1189613 [email protected] -- Hide unuseful output when re-generate initrd. -Patch6: plymouth-quiet-dracut-build-info.patch +Patch7: plymouth-quiet-dracut-build-info.patch # PATCH-FIX-OPENSUSE plymouth-watermark-config.patch bsc#1189613 [email protected] -- Add two-step water mark config support. -Patch7: plymouth-watermark-config.patch +Patch8: plymouth-watermark-config.patch # PATCH-FIX-OPENSUSE plymouth-log-on-default.patch bsc#1193736 [email protected] -- Enable plymouth log by default, help to resolve random appear problems. -Patch8: plymouth-log-on-default.patch +Patch9: plymouth-log-on-default.patch # PATCH-FIX-OPENSUSE plymouth-screen-twice-scale-on-160DPI-higher.patch boo#1183425 boo#1184309 [email protected] -- When DPI > 160, screen will scale output twice. -Patch9: plymouth-screen-twice-scale-on-160DPI-higher.patch +Patch10: plymouth-screen-twice-scale-on-160DPI-higher.patch # PATCH-FIX-OPENSUSE plymouth-crash-avoid-on-keyboard-remove-input-handler.patch bsc#1193736 [email protected] -- Confirm keyboard handler list not NULL before release memory to avoid crash. -Patch10: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch -# PATCH-FIX-OPENSUSE plymouth-adapts-xkbommon.patch [email protected] -- openSUSE specify xkbommon header files position, plymouth adapt with that to build successfully. -Patch11: plymouth-adapts-xkbommon.patch +Patch11: plymouth-crash-avoid-on-keyboard-remove-input-handler.patch +BuildRequires: automake BuildRequires: docbook-xsl-stylesheets BuildRequires: gcc BuildRequires: libtool @@ -79,11 +80,6 @@ %if %{with x11_renderer} BuildRequires: pkgconfig(gtk+-3.0) >= 3.14.0 %endif -BuildRequires: cmake -BuildRequires: git -BuildRequires: meson -BuildRequires: pkgconfig(libevdev) -BuildRequires: pkgconfig(xkbcommon) Recommends: %{name}-lang Requires: %{name}-branding Requires: systemd >= 186 @@ -366,50 +362,46 @@ %prep %setup -q %autopatch -p1 +autoreconf -ivf %build -%meson \ - -D systemd-integration=true \ - -D tracing=true \ - -D upstart-monitoring=false \ +%configure \ + --enable-systemd-integration \ + --enable-tracing \ + --disable-silent-rules \ + --disable-static \ + --disable-upstart-monitoring \ + --disable-tests \ %if %{without x11_renderer} - -D gtk=disabled \ + --disable-gtk \ %endif -%if 0%{?is_opensuse} - -D logo=/usr/share/pixmaps/distribution-logos/light-inline.png \ -%endif - -D release-file=/etc/os-release \ - -D runstatedir=/run \ - -D boot-tty=tty1 \ - -D shutdown-tty=tty1 \ - -D background-start-color-stop=0x1A3D1F \ - -D background-end-color-stop=0x4EA65C \ - -D background-color=0x3391cd \ - -D debug=true \ - -D warning_level=0 \ - -D docs=true \ - -D drm=true \ - -D freetype=enabled \ -%{nil} -%meson_build + --with-release-file=%{_sysconfdir}/os-release \ + --with-shutdown-tty=/dev/tty7 \ + --with-background-start-color-stop=0x1A3D1F \ + --with-background-end-color-stop=0x4EA65C \ + --with-background-color=0x3391cd \ + --runstatedir=/run \ + --without-rhgb-compat-link \ + --without-system-root-install + +make %{?_smp_mflags} %install -%meson_install +%make_install # *.la are files generated during compilation, useless for final user. find %{buildroot} -type f -name "*.la" -delete # Glow isn't quite ready for primetime -%{__rm} -rf %{buildroot}%{_datadir}/%{name}/themes/glow/ +rm -rf %{buildroot}%{_datadir}/plymouth/themes/glow/ -# We will nolonger install /etc/plymouthd.conf. The plymouthd will read /usr/share/plymouth/plymouthd.defaults to get default settings -# unless user create the config file explicitly(jsc#SLE-11637). -%{__rm} -f %{buildroot}%{_sysconfdir}/%{name}/plymouthd.conf +# We will nolonger ship plymouthd.conf, Plymouthd will read /usr/share/plymouth/plymouthd.defaults if /etc/plymouth/plymouthd.conf doesn't exist(jsc#SLE-11637). +rm -f %{buildroot}%{_sysconfdir}/plymouth/plymouthd.conf # Move logrotate files from user specific directory /etc/logrotate.d to vendor specific directory /usr/etc/logrotate.d. %if 0%{?suse_version} > 1500 -%{__mkdir} -p %{buildroot}%{_distconfdir}/logrotate.d -%{__mv} %{buildroot}%{_sysconfdir}/logrotate.d/bootlog %{buildroot}%{_distconfdir}/logrotate.d/bootlog +mkdir -p %{buildroot}%{_distconfdir}/logrotate.d +mv %{buildroot}%{_sysconfdir}/logrotate.d/bootlog %{buildroot}%{_distconfdir}/logrotate.d/bootlog %endif # Split lang to seperate package. @@ -530,9 +522,6 @@ %else %{_sysconfdir}/logrotate.d/bootlog %endif -%if !0%{?is_opensuse} -%{_datadir}/plymouth/bizcom.png -%endif %{_bindir}/plymouth %{_sbindir}/plymouthd %{_libdir}/plymouth/details.so @@ -541,6 +530,7 @@ %{_libdir}/plymouth/renderers/frame-buffer* %{_datadir}/plymouth/themes/details/details.plymouth %{_datadir}/plymouth/themes/text/text.plymouth +%{_datadir}/plymouth/bizcom.png %ghost /run/plymouth %{_localstatedir}/spool/plymouth %{_mandir}/man?/* @@ -548,7 +538,7 @@ %{_unitdir}/* %ghost %{_localstatedir}/log/boot.log %{_libexecdir}/plymouth/plymouthd-fd-escrow -%doc AUTHORS README.md ply_header.svg +%doc AUTHORS NEWS README.md ply_header.svg %license COPYING %files lang -f %{name}.lang ++++++ plymouth-22.02.122+180.b1d5aa9.tar.xz -> plymouth-22.02.122+94.4bd41a3.tar.xz ++++++ /work/SRC/openSUSE:Factory/plymouth/plymouth-22.02.122+180.b1d5aa9.tar.xz /work/SRC/openSUSE:Factory/.plymouth.new.3193/plymouth-22.02.122+94.4bd41a3.tar.xz differ: char 26, line 1 ++++++ plymouth-crash-avoid-on-keyboard-remove-input-handler.patch ++++++ --- /var/tmp/diff_new_pack.shlbic/_old 2023-07-16 17:18:19.832229051 +0200 +++ /var/tmp/diff_new_pack.shlbic/_new 2023-07-16 17:18:19.836229075 +0200 @@ -1,6 +1,6 @@ -diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply-splash-core/ply-keyboard.c plymouth-22.02.122+180.b1d5aa9_new/src/libply-splash-core/ply-keyboard.c ---- plymouth-22.02.122+180.b1d5aa9/src/libply-splash-core/ply-keyboard.c 2023-06-08 10:49:58.000000000 +0800 -+++ plymouth-22.02.122+180.b1d5aa9_new/src/libply-splash-core/ply-keyboard.c 2023-07-12 22:52:25.011378645 +0800 +diff -Nura plymouth-0.9.5~git20220719.9e72df3/src/libply-splash-core/ply-keyboard.c plymouth-0.9.5~git20220719.9e72df3_new/src/libply-splash-core/ply-keyboard.c +--- plymouth-0.9.5~git20220719.9e72df3/src/libply-splash-core/ply-keyboard.c 2022-04-15 16:39:24.000000000 +0800 ++++ plymouth-0.9.5~git20220719.9e72df3_new/src/libply-splash-core/ply-keyboard.c 2022-07-29 14:19:35.951346564 +0800 @@ -522,6 +522,8 @@ assert (keyboard != NULL); @@ -18,11 +18,4 @@ } void -@@ -666,4 +669,4 @@ - } - - return NULL; --} -\ æ件尾没ææ¢è¡ç¬¦ -+} ++++++ plymouth-disable-fedora-logo.patch ++++++ --- /var/tmp/diff_new_pack.shlbic/_old 2023-07-16 17:18:19.848229147 +0200 +++ /var/tmp/diff_new_pack.shlbic/_new 2023-07-16 17:18:19.852229171 +0200 @@ -1,13 +1,9 @@ -diff -Nura plymouth-22.02.122+180.b1d5aa9/themes/spinfinity/meson.build plymouth-22.02.122+180.b1d5aa9_new/themes/spinfinity/meson.build ---- plymouth-22.02.122+180.b1d5aa9/themes/spinfinity/meson.build 2022-11-27 00:45:52.000000000 +0800 -+++ plymouth-22.02.122+180.b1d5aa9_new/themes/spinfinity/meson.build 2023-07-12 18:00:50.140486797 +0800 -@@ -53,8 +53,3 @@ - 'throbber-33.png', - install_dir: plymouth_theme_path / 'spinfinity', - ) -- --install_symlink('header-image.png', -- install_dir: plymouth_theme_path / 'spinfinity', -- pointing_to: plymouth_logo_file, --) +diff -Nura plymouth-0.9.5~git20220412.e960111/themes/spinfinity/Makefile.am plymouth-0.9.5~git20220412.e960111_new/themes/spinfinity/Makefile.am +--- plymouth-0.9.5~git20220412.e960111/themes/spinfinity/Makefile.am 2022-04-15 16:39:24.000000000 +0800 ++++ plymouth-0.9.5~git20220412.e960111_new/themes/spinfinity/Makefile.am 2022-04-18 15:47:44.346708483 +0800 +@@ -54,4 +54,3 @@ + EXTRA_DIST = spinfinity.plymouth.in + + install-data-hook: +- ln -sf $(logofile) $(DESTDIR)$(themedir)/header-image.png ++++++ plymouth-log-on-default.patch ++++++ --- /var/tmp/diff_new_pack.shlbic/_old 2023-07-16 17:18:19.872229291 +0200 +++ /var/tmp/diff_new_pack.shlbic/_new 2023-07-16 17:18:19.876229315 +0200 @@ -1,6 +1,6 @@ -diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.c plymouth-22.02.122+180.b1d5aa9_new/src/libply/ply-buffer.c ---- plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.c 2022-11-28 18:33:06.000000000 +0800 -+++ plymouth-22.02.122+180.b1d5aa9_new/src/libply/ply-buffer.c 2023-07-12 22:25:31.095721303 +0800 +diff -Nura plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.c plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.c +--- plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.c 2022-04-15 16:39:24.000000000 +0800 ++++ plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.c 2022-08-04 16:27:35.810694440 +0800 @@ -46,6 +46,10 @@ #define PLY_BUFFER_MAX_BUFFER_CAPACITY (255 * 4096) #endif @@ -33,11 +33,11 @@ void ply_buffer_remove_bytes (ply_buffer_t *buffer, size_t bytes_to_remove) -@@ -206,6 +224,37 @@ - buffer->data[buffer->size] = '\0'; +@@ -205,6 +223,38 @@ } -+void ply_buffer_append_log_bytes (ply_buffer_t *buffer, + void ++ply_buffer_append_log_bytes (ply_buffer_t *buffer, + const void *bytes_in, + size_t length) +{ @@ -47,7 +47,7 @@ + + const uint8_t *bytes = bytes_in; + -+ if (length > PLY_BUFFER_MAX_BUFFER_CAPACITY) ++ if (length > PLY_BUFFER_MAX_BUFFER_CAPACITY) + { + bytes += length - (PLY_BUFFER_MAX_BUFFER_CAPACITY - 1); + length = (PLY_BUFFER_MAX_BUFFER_CAPACITY - 1); @@ -68,12 +68,13 @@ + buffer->data[buffer->size] = '\0'; +} + - void ++void ply_buffer_append_from_fd (ply_buffer_t *buffer, int fd) -diff -Nura plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.h plymouth-22.02.122+180.b1d5aa9_new/src/libply/ply-buffer.h ---- plymouth-22.02.122+180.b1d5aa9/src/libply/ply-buffer.h 2022-11-27 00:45:52.000000000 +0800 -+++ plymouth-22.02.122+180.b1d5aa9_new/src/libply/ply-buffer.h 2023-07-12 22:20:11.765612637 +0800 + { +diff -Nura plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.h plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.h +--- plymouth-0.9.5~git20220801.eb1b893/src/libply/ply-buffer.h 2022-04-15 16:39:24.000000000 +0800 ++++ plymouth-0.9.5~git20220801.eb1b893_new/src/libply/ply-buffer.h 2022-08-04 16:27:35.810694440 +0800 @@ -35,6 +35,10 @@ const void *bytes, size_t number_of_bytes); @@ -85,41 +86,93 @@ void ply_buffer_append_from_fd (ply_buffer_t *buffer, int fd); #define ply_buffer_append(buffer, format, args ...) \ -diff -Nura plymouth-22.02.122+180.b1d5aa9/src/main.c plymouth-22.02.122+180.b1d5aa9_new/src/main.c ---- plymouth-22.02.122+180.b1d5aa9/src/main.c 2023-06-08 10:49:58.000000000 +0800 -+++ plymouth-22.02.122+180.b1d5aa9_new/src/main.c 2023-07-12 22:38:56.846042006 +0800 -@@ -1283,8 +1283,7 @@ +diff -Nura plymouth-0.9.5~git20220801.eb1b893/src/main.c plymouth-0.9.5~git20220801.eb1b893_new/src/main.c +--- plymouth-0.9.5~git20220801.eb1b893/src/main.c 2022-08-02 21:28:28.000000000 +0800 ++++ plymouth-0.9.5~git20220801.eb1b893_new/src/main.c 2022-08-04 17:37:22.768631505 +0800 +@@ -1225,8 +1225,7 @@ } /* do not let any tty opened where we could write after deactivate */ - if (ply_kernel_command_line_has_argument ("plymouth.debug")) - ply_logger_close_file (ply_logger_get_error_default ()); -+ ply_logger_close_file (ply_logger_get_error_default ()); ++ ply_logger_close_file (ply_logger_get_error_default ()); } static void -@@ -1916,6 +1915,7 @@ +@@ -1853,77 +1852,42 @@ state->is_attached = false; } -+#if 0 - static void - check_verbosity (state_t *state) - { -@@ -1988,6 +1988,45 @@ - debug_buffer); - } - } -+#endif -+ +-static void +-check_verbosity (state_t *state) +static void initialize_debug (state_t *state) -+{ + { +- char *stream; +- +- ply_trace ("checking if tracing should be enabled"); +- +- if (!debug_buffer_path) +- debug_buffer_path = ply_kernel_command_line_get_key_value ("plymouth.debug=file:"); +- +- stream = ply_kernel_command_line_get_key_value ("plymouth.debug=stream:"); +- if (stream != NULL || debug_buffer_path != NULL || +- ply_kernel_command_line_has_argument ("plymouth.debug")) { +- int fd; +- +- ply_trace ("tracing should be enabled!"); +- if (!ply_is_tracing ()) +- ply_toggle_tracing (); +- +- if (debug_buffer == NULL) +- debug_buffer = ply_buffer_new (); +- +- if (stream != NULL) { +- ply_trace ("streaming debug output to %s instead of screen", stream); +- fd = open (stream, O_RDWR | O_NOCTTY | O_CREAT, 0600); +- +- if (fd < 0) +- ply_trace ("could not stream output to %s: %m", stream); +- else +- ply_logger_set_output_fd (ply_logger_get_error_default (), fd); +- free (stream); +- } else { +- const char *device; +- char *file; +- +- device = state->default_tty; +- +- ply_trace ("redirecting debug output to %s", device); +- +- if (strncmp (device, "/dev/", strlen ("/dev/")) == 0) +- file = strdup (device); +- else +- asprintf (&file, "/dev/%s", device); + if (!ply_is_tracing ()) + ply_toggle_tracing (); -+ + +- fd = open (file, O_RDWR | O_APPEND); + if (debug_buffer == NULL) + debug_buffer = ply_buffer_new (); -+ + +- if (fd < 0) +- ply_trace ("could not redirected debug output to %s: %m", device); +- else +- ply_logger_set_output_fd (ply_logger_get_error_default (), fd); +- +- free (file); +- } +- } else { +- ply_trace ("tracing shouldn't be enabled!"); +- } +- +- if (debug_buffer != NULL) { +- if (debug_buffer_path == NULL) { +- if (state->mode == PLY_BOOT_SPLASH_MODE_SHUTDOWN || +- state->mode == PLY_BOOT_SPLASH_MODE_REBOOT) +- debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-shutdown-debug.log"); +- else +- debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-debug.log"); +- } + char *stream = ply_kernel_command_line_get_key_value ("plymouth.debug=stream:"); + if (stream != NULL) + { @@ -141,47 +194,46 @@ + else + debug_buffer_path = strdup (PLYMOUTH_LOG_DIRECTORY "/plymouth-debug.log"); + } -+ + +- ply_logger_add_filter (ply_logger_get_error_default (), +- (ply_logger_filter_handler_t) +- on_error_message, +- debug_buffer); +- } + if (debug_buffer != NULL) + { -+ ply_logger_add_filter (ply_logger_get_error_default (), -+ (ply_logger_filter_handler_t) on_error_message, ++ ply_logger_add_filter (ply_logger_get_error_default (), ++ (ply_logger_filter_handler_t) on_error_message, + debug_buffer); + } -+} + } static void - check_logging (state_t *state) -@@ -2074,8 +2113,10 @@ - ply_trace ("going to go with '%s'", state->default_tty); +@@ -2007,7 +1971,7 @@ } } -- -+#if 0 - check_verbosity (state); -+#endif + +- check_verbosity (state); + initialize_debug (state); check_logging (state); ply_trace ("source built on %s", __DATE__); -@@ -2101,7 +2142,10 @@ +@@ -2033,7 +1997,7 @@ const void *bytes, size_t number_of_bytes) { -+#if 0 - ply_buffer_append_bytes (debug_buffer, bytes, number_of_bytes); -+#endif +- ply_buffer_append_bytes (debug_buffer, bytes, number_of_bytes); + ply_buffer_append_log_bytes (debug_buffer, bytes, number_of_bytes); } static void -@@ -2224,7 +2268,7 @@ +@@ -2156,7 +2120,7 @@ bool should_help = false; bool no_boot_log = false; bool no_daemon = false; - bool debug = false; + bool debug = true; bool ignore_serial_consoles = false; - bool graphical_boot = false; bool attach_to_session; + ply_daemon_handle_t *daemon_handle = NULL; ++++++ plymouth-manpages.patch ++++++ Index: plymouth-0.9.3+git20180807.7663b0c/docs/Makefile.am =================================================================== --- plymouth-0.9.3+git20180807.7663b0c.orig/docs/Makefile.am 2018-08-07 17:41:15.000000000 +0200 +++ plymouth-0.9.3+git20180807.7663b0c/docs/Makefile.am 2018-08-17 19:58:25.330646165 +0200 @@ -16,12 +16,14 @@ plymouth.1: plymouth1.xml %.1: %.xml $(AM_V_GEN) $(XSLTPROC) $(XSLTPROC_FLAGS) http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< -man_MANS = \ +man1_MANS = \ plymouth.1 \ - plymouth.8 \ - plymouthd.8 \ plymouth-set-default-theme.1 +man8_MANS = \ + plymouth.8 \ + plymouthd.8 + EXTRA_DIST = \ plymouth.xml \ plymouth1.xml \
