diff --git a/Makefile b/Makefile index abab331..819698d 100644 --- a/Makefile +++ b/Makefile @@ -36,6 +36,10 @@ install-local: mkdir -p $(DESTDIR)/usr/share/pixmaps $(INSTALL) $(PIXMAPS) $(DESTDIR)/usr/share/pixmaps/ + # Create a 'debian-theme' symlink in plymouth themes folder, pointing at the + # plymouth theme for the currently active 'debian-theme' alternative. + mkdir -p $(DESTDIR)/usr/share/plymouth/themes + ln -s ../../desktop-base/active-theme/plymouth $(DESTDIR)/usr/share/plymouth/themes/debian-theme # Set Plasma 5/KDE default wallpaper install -d $(DESTDIR)/usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates @@ -54,7 +58,6 @@ 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 @@ -78,8 +81,6 @@ 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 @@ -109,7 +110,6 @@ install-local: # 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 @@ -129,7 +129,6 @@ 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 @@ -159,7 +158,6 @@ 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/README.Debian b/debian/README.Debian index 8825f92..ae97221 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -224,11 +224,6 @@ A theme pack should contain the following elements: messages, fsck feedback… so it’s highly recommended to start with an existing script and adapt the background setup and animation to the needs of your theme. -./plymouthd.default --> Should be a drop in replacement for /usr/share/plymouth/plymouthd.defaults - selecting your team. This file is not currently used but when we finish - integrating plymouth with the themes pack system we’ll be able to handle - plymouth theme switching with the rest of the theme elements in Debian. ./login/background.svg -> To provide the login background alternative for LightDM, SDDM… diff --git a/debian/changelog b/debian/changelog index b7f5da8..65d0abd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ desktop-base (9.0.6) UNRELEASED; urgency=medium * Bump Standards-Version to 4.0.0 (no changes needed). * Drop versioned pre-depends on dpkg for dpkg-maintscript-helper that has been available in dpkg since wheezy. + * Add a debian-theme theme for plymouth themes. This should help switching + the plymouth theme with the rest of the global theme package. -- Aurélien COUDERC Thu, 06 Jul 2017 17:09:44 +0200 diff --git a/joy-theme/plymouthd.defaults b/joy-theme/plymouthd.defaults deleted file mode 100644 index a50c7b8..0000000 --- a/joy-theme/plymouthd.defaults +++ /dev/null @@ -1,4 +0,0 @@ -# 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 deleted file mode 100644 index d7f70ff..0000000 --- a/lines-theme/plymouthd.defaults +++ /dev/null @@ -1,4 +0,0 @@ -# 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 deleted file mode 100644 index d847571..0000000 --- a/softwaves-theme/plymouthd.defaults +++ /dev/null @@ -1,4 +0,0 @@ -# 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 deleted file mode 100644 index 5999102..0000000 --- a/spacefun-theme/plymouthd.defaults +++ /dev/null @@ -1,4 +0,0 @@ -# Defaults provided by desktop-base for the spacefun theme -[Daemon] -Theme=spacefun -ShowDelay=0