From 111251754604271d37c8abefc99bbb79adae1b05 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Aur=C3=A9lien=20COUDERC?= Date: Tue, 27 Dec 2016 20:53:06 +0000 Subject: [PATCH] Prepare for plymouth splash integration into theme packs that will allow splash selection via alternatives in the future --- Makefile | 11 ++++++++++- debian/changelog | 2 ++ joy-theme/plymouthd.defaults | 4 ++++ lines-theme/plymouthd.defaults | 4 ++++ softwaves-theme/plymouthd.defaults | 4 ++++ spacefun-theme/plymouthd.defaults | 4 ++++ 6 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 joy-theme/plymouthd.defaults create mode 100644 lines-theme/plymouthd.defaults create mode 100644 softwaves-theme/plymouthd.defaults create mode 100644 spacefun-theme/plymouthd.defaults diff --git a/Makefile b/Makefile index 46407a9..e0afab0 100644 --- a/Makefile +++ b/Makefile @@ -56,6 +56,7 @@ install-local: install -d $(DESTDIR)/usr/share/plymouth/themes/spacefun $(INSTALL) $(wildcard spacefun-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/spacefun cd $(DESTDIR)/usr/share/desktop-base/spacefun-theme && ln -s /usr/share/plymouth/themes/spacefun plymouth + $(INSTALL) spacefun-theme/plymouthd.defaults $(DESTDIR)/usr/share/desktop-base/spacefun-theme ### Login background install -d $(DESTDIR)/usr/share/desktop-base/spacefun-theme/login $(INSTALL) $(wildcard spacefun-theme/login/*) $(DESTDIR)/usr/share/desktop-base/spacefun-theme/login @@ -79,6 +80,8 @@ install-local: install -d $(DESTDIR)/usr/share/plymouth/themes/joy $(INSTALL) $(wildcard joy-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/joy cd $(DESTDIR)/usr/share/desktop-base/joy-theme && ln -s /usr/share/plymouth/themes/joy plymouth + $(INSTALL) joy-theme/plymouthd.defaults $(DESTDIR)/usr/share/desktop-base/joy-theme + ### Login background install -d $(DESTDIR)/usr/share/desktop-base/joy-theme/login $(INSTALL) $(wildcard joy-theme/login/*) $(DESTDIR)/usr/share/desktop-base/joy-theme/login @@ -105,7 +108,11 @@ install-local: # Joy Inksplat theme (Wheezy’s alternate theme) install -d $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme ### Plymouth theme - cd $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme && ln -s /usr/share/plymouth/themes/joy plymouth + # Reuse « normal » joy theme + cd $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme \ + && ln -s /usr/share/plymouth/themes/joy plymouth \ + && ln -s /usr/share/desktop-base/joy-theme/plymouthd.defaults plymouthd.defaults + ### Wallpapers install -d $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper/contents/images $(INSTALL) joy-inksplat-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/joy-inksplat-theme/wallpaper @@ -124,6 +131,7 @@ install-local: install -d $(DESTDIR)/usr/share/plymouth/themes/lines $(INSTALL) $(wildcard lines-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/lines cd $(DESTDIR)/usr/share/desktop-base/lines-theme && ln -s /usr/share/plymouth/themes/lines plymouth + $(INSTALL) lines-theme/plymouthd.defaults $(DESTDIR)/usr/share/desktop-base/lines-theme ### Login background install -d $(DESTDIR)/usr/share/desktop-base/lines-theme/login $(INSTALL) $(wildcard lines-theme/login/*) $(DESTDIR)/usr/share/desktop-base/lines-theme/login @@ -153,6 +161,7 @@ install-local: install -d $(DESTDIR)/usr/share/plymouth/themes/softwaves $(INSTALL) $(wildcard softwaves-theme/plymouth/*) $(DESTDIR)/usr/share/plymouth/themes/softwaves cd $(DESTDIR)/usr/share/desktop-base/softwaves-theme && ln -s /usr/share/plymouth/themes/softwaves plymouth + $(INSTALL) softwaves-theme/plymouthd.defaults $(DESTDIR)/usr/share/desktop-base/softwaves-theme ### Login background install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/login $(INSTALL) $(wildcard softwaves-theme/login/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/login diff --git a/debian/changelog b/debian/changelog index 19fe844..67829c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,8 @@ desktop-base (9.0.0) UNRELEASED; urgency=medium [ Aurélien COUDERC ] * Implement Plymouth splash for Stretch’s soft Waves theme. (Closes: #843998, #842078) + * Prepare for plymouth splash integration into theme packs that will allow + splash selection via alternatives in the future. -- Aurélien COUDERC Tue, 27 Dec 2016 17:58:13 +0100 diff --git a/joy-theme/plymouthd.defaults b/joy-theme/plymouthd.defaults new file mode 100644 index 0000000..a50c7b8 --- /dev/null +++ b/joy-theme/plymouthd.defaults @@ -0,0 +1,4 @@ +# Defaults provided by desktop-base for the joy theme +[Daemon] +Theme=joy +ShowDelay=0 diff --git a/lines-theme/plymouthd.defaults b/lines-theme/plymouthd.defaults new file mode 100644 index 0000000..d7f70ff --- /dev/null +++ b/lines-theme/plymouthd.defaults @@ -0,0 +1,4 @@ +# Defaults provided by desktop-base for the lines theme +[Daemon] +Theme=lines +ShowDelay=0 diff --git a/softwaves-theme/plymouthd.defaults b/softwaves-theme/plymouthd.defaults new file mode 100644 index 0000000..d847571 --- /dev/null +++ b/softwaves-theme/plymouthd.defaults @@ -0,0 +1,4 @@ +# Defaults provided by desktop-base for the softwaves theme +[Daemon] +Theme=softwaves +ShowDelay=0 diff --git a/spacefun-theme/plymouthd.defaults b/spacefun-theme/plymouthd.defaults new file mode 100644 index 0000000..5999102 --- /dev/null +++ b/spacefun-theme/plymouthd.defaults @@ -0,0 +1,4 @@ +# Defaults provided by desktop-base for the spacefun theme +[Daemon] +Theme=spacefun +ShowDelay=0