diff --git a/Makefile b/Makefile index b677b37..afc7d3a 100644 --- a/Makefile +++ b/Makefile @@ -106,3 +106,29 @@ install: install -d $(DESTDIR)/usr/share/plymouth/themes/lines $(INSTALL) $(wildcard plymouth/lines/*) $(DESTDIR)/usr/share/plymouth/themes/lines + + # Soft waves theme (Stretch default) + ### Login background + install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme + $(INSTALL) softwaves-theme/sddm-preview.jpg $(DESTDIR)/usr/share/desktop-base/softwaves-theme/ + install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/backgrounds + $(INSTALL) softwaves-theme/backgrounds/login.svg $(DESTDIR)/usr/share/desktop-base/softwaves-theme/backgrounds + ### Wallpapers + install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper/contents/images + $(INSTALL) softwaves-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper + $(INSTALL) softwaves-theme/wallpaper/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper + $(INSTALL) $(wildcard softwaves-theme/wallpaper/contents/images/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/wallpaper/contents/images/ + $(INSTALL) softwaves-theme/gnome-wp-list-softwaves.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-softwaves.xml + # Wallpaper symlink for KDE + install -d $(DESTDIR)/usr/share/wallpapers + cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/softwaves-theme/wallpaper SoftWaves + + ### Lockscreen + install -d $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen/contents/images + $(INSTALL) softwaves-theme/lockscreen/metadata.desktop $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen + $(INSTALL) softwaves-theme/lockscreen/gnome-background.xml $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen + $(INSTALL) $(wildcard softwaves-theme/lockscreen/contents/images/*) $(DESTDIR)/usr/share/desktop-base/softwaves-theme/lockscreen/contents/images/ + $(INSTALL) softwaves-theme/gnome-wp-list-softwaves.xml $(DESTDIR)/usr/share/gnome-background-properties/debian-softwaves.xml + # Lock screen symlink for KDE + install -d $(DESTDIR)/usr/share/wallpapers + cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/softwaves-theme/lockscreen SoftWavesLockScreen diff --git a/debian/changelog b/debian/changelog index d512b10..9091ecc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ desktop-base (9.0.0~exp1) UNRELEASED; urgency=medium [ Aurélien COUDERC ] + * Initial support for Soft Waves theme by Juliette Belin. + - Default theme for Gnome wallpaper and lock screen + - Theme available for SDDM login and Plasma 5 wallpaper and lock screen + - debian/copyright updated + * Initial support for global theme switching via alternatives + * Remove references to long gone KDE3 globals in maintainer scripts. (Closes: #659549) * README.Debian: inform about updating initrds too. (Closes: #612163) diff --git a/debian/copyright b/debian/copyright index fbdcbdc..a8fff66 100644 --- a/debian/copyright +++ b/debian/copyright @@ -43,12 +43,19 @@ Copyright Ulrich Hansen , Mainz, Germany, 2010, published under GPL2 or higher (at your option) They are based on the Debian “Open Use” Logo (without the “Debian” label). -The .desktop files included in this package were compiled by Colin -Walters . +The .desktop files and xml configuration files in this package were compiled by +desktop-base contributors. icons/*/emblems/emblem-debian.{png,svg} are different versions of the Debian “Open Use” Logo (without the “Debian” label). +The SDDM QML script is © 2016 David Edmundson and adapted for Debian by +Aurélien Couderc. + + +The Soft Waves theme is © 2016 Juliette Taka Belin and released under the GPLv2 +or any later version. + The Lines theme is © 2014 Juliette Taka Belin and released under the GPLv2 or any later version. diff --git a/debian/gsettings-override b/debian/gsettings-override index 40644ec..1a06cef 100644 --- a/debian/gsettings-override +++ b/debian/gsettings-override @@ -4,4 +4,4 @@ picture-uri='file:///usr/share/images/desktop-base/desktop-background.xml' [org.gnome.desktop.screensaver] picture-options='zoom' -picture-uri='file:///usr/share/images/desktop-base/lines-lockscreen.xml' +picture-uri='file:///usr/share/images/desktop-base/desktop-lockscreen.xml' diff --git a/debian/postinst b/debian/postinst index a5e397a..3b37891 100644 --- a/debian/postinst +++ b/debian/postinst @@ -6,23 +6,49 @@ if [ "$1" = configure ] && dpkg --compare-versions "$2" lt-nl 7; then fi if [ "$1" = "configure" -o "$1" = "abort-upgrade" ]; then - # Alternatives for the background + # Theme package alternatives + while read theme priority; do + update-alternatives --install \ + /usr/share/desktop-base/active-theme \ + desktop-theme \ + /usr/share/desktop-base/$theme-theme $priority + done << EOF +softwaves 50 +EOF + + # Use active theme as highest priority for background + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-background \ + desktop-background \ + /usr/share/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg 70 + # Alternatives for the background in theme packages + while read theme filename priority; do + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-background \ + desktop-background \ + /usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename $priority + done << EOF +softwaves 1280x720.svg 65 +softwaves 1920x1080.svg 65 +softwaves 2560x1440.svg 65 +EOF + # Old alternatives for the background while read background priority; do update-alternatives --install \ /usr/share/images/desktop-base/desktop-background \ desktop-background \ /usr/share/images/desktop-base/$background $priority done << EOF -lines-wallpaper_1280x1024.svg 65 -lines-wallpaper_1600x1200.svg 65 -lines-wallpaper_1920x1080.svg 70 -lines-wallpaper_1920x1200.svg 65 -lines-wallpaper_2560x1080.svg 65 -joy-wallpaper_1600x1200.svg 60 -joy-wallpaper_1280x1024.svg 60 -joy-wallpaper_1920x1080.svg 60 -joy-wallpaper_1920x1200.svg 60 -joy-inksplat-wallpaper_1920x1080.svg 60 +lines-wallpaper_1280x1024.svg 60 +lines-wallpaper_1600x1200.svg 60 +lines-wallpaper_1920x1080.svg 60 +lines-wallpaper_1920x1200.svg 60 +lines-wallpaper_2560x1080.svg 60 +joy-wallpaper_1600x1200.svg 50 +joy-wallpaper_1280x1024.svg 50 +joy-wallpaper_1920x1080.svg 50 +joy-wallpaper_1920x1200.svg 50 +joy-inksplat-wallpaper_1920x1080.svg 50 spacefun-wallpaper.svg 50 spacefun-wallpaper-widescreen.svg 50 moreblue-orbit-wallpaper.svg 40 @@ -31,6 +57,21 @@ EOF # Set up an alternative for the XML version of the background # (for GNOME) + # Highest priority for active theme + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-background.xml \ + desktop-background.xml \ + /usr/share/desktop-base/active-theme/wallpaper/gnome-background.xml 50 + # Alternative for theme packages + while read theme priority; do + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-background.xml \ + desktop-background.xml \ + /usr/share/desktop-base/$theme-theme/wallpaper/gnome-background.xml $priority + done << EOF +softwaves 40 +EOF + # Old alternatives while read desktopbackground priority; do update-alternatives --install \ /usr/share/images/desktop-base/desktop-background.xml \ @@ -38,27 +79,63 @@ EOF /usr/share/images/desktop-base/$desktopbackground $priority done << EOF lines.xml 20 -joy.xml 10 +joy.xml 20 +EOF + + # Set up an alternative for the XML version of the lock screen + # (for GNOME) + # Highest priority for active theme + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-lockscreen.xml \ + desktop-lockscreen.xml \ + /usr/share/desktop-base/active-theme/lockscreen/gnome-background.xml 50 + # Alternative for theme packages + while read theme priority; do + update-alternatives --install \ + /usr/share/images/desktop-base/desktop-lockscreen.xml \ + desktop-lockscreen.xml \ + /usr/share/desktop-base/$theme-theme/lockscreen/gnome-background.xml $priority + done << EOF +softwaves 40 EOF # Login theme + # Highest priority for active theme + update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ + desktop-login-background \ + /usr/share/desktop-base/active-theme/backgrounds/login.svg 50 \ + --slave /usr/share/sddm/themes/debian-theme/sddm-preview.jpg \ + desktop-sddm-preview \ + /usr/share/desktop-base/active-theme/sddm-preview.jpg + # Alternative for theme packages + while read theme priority; do + update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ + desktop-login-background \ + /usr/share/desktop-base/$theme-theme/backgrounds/login.svg $priority \ + --slave /usr/share/sddm/themes/debian-theme/sddm-preview.jpg \ + desktop-sddm-preview \ + /usr/share/desktop-base/$theme-theme/sddm-preview.jpg + done << EOF +softwaves 40 +EOF + # Old alternatives ## Lines update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ desktop-login-background \ - /usr/share/desktop-base/lines-theme/login-background.svg 70 \ + /usr/share/desktop-base/lines-theme/login-background.svg 20 \ --slave /usr/share/sddm/themes/debian-theme/sddm-preview.jpg \ desktop-sddm-preview \ /usr/share/desktop-base/lines-theme/sddm-preview.jpg update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ desktop-login-background \ - /usr/share/desktop-base/lines-theme/login-background-with-logo.svg 65 \ + /usr/share/desktop-base/lines-theme/login-background-with-logo.svg 20 \ --slave /usr/share/sddm/themes/debian-theme/sddm-preview.jpg \ desktop-sddm-preview \ /usr/share/desktop-base/lines-theme/sddm-preview.jpg ## Joy update-alternatives --install /usr/share/images/desktop-base/login-background.svg \ desktop-login-background \ - /usr/share/desktop-base/joy-theme/login-background.svg 60 \ + /usr/share/desktop-base/joy-theme/login-background.svg 20 \ --slave /usr/share/sddm/themes/debian-theme/sddm-preview.jpg \ desktop-sddm-preview \ /usr/share/desktop-base/joy-theme/sddm-preview.jpg diff --git a/debian/prerm b/debian/prerm index e6fb79a..e599bb1 100644 --- a/debian/prerm +++ b/debian/prerm @@ -4,7 +4,19 @@ set -e #DEBHELPER# if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then - # remove background alternatives + # Remove background alternatives for active theme + update-alternatives --remove desktop-background /usr/share/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg + # Remove background alternatives for theme packages + while read theme filename; do + update-alternatives --remove \ + desktop-background \ + /usr/share/desktop-base/$theme-theme/wallpaper/contents/images/$filename $priority + done << EOF +softwaves 1280x720.svg +softwaves 1920x1080.svg +softwaves 2560x1440.svg +EOF + # Remove old background alternatives for background in \ lines-wallpaper_1280x1024.svg \ lines-wallpaper_1600x1200.svg \ @@ -24,7 +36,20 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then ; do update-alternatives --remove desktop-background /usr/share/images/desktop-base/$background done - # remove desktop-background.xml alternatives + # Remove desktop-background.xml alternatives + # For active theme + update-alternatives --remove \ + desktop-background.xml \ + /usr/share/desktop-base/active-theme/wallpaper/gnome-background.xml + # For theme packages + while read theme; do + update-alternatives --remove \ + desktop-background.xml \ + /usr/share/desktop-base/$theme-theme/wallpaper/gnome-background.xml $priority + done << EOF +softwaves +EOF + # For old alternatives for desktopbackground in \ lines.xml \ joy.xml \ @@ -32,7 +57,41 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then update-alternatives --remove desktop-background.xml /usr/share/images/desktop-base/$desktopbackground done - # remove login theme alternatives + # Remove desktop-lockscreen.xml alternatives + # For active theme + update-alternatives --remove \ + desktop-lockscreen.xml \ + /usr/share/desktop-base/active-theme/lockscreen/gnome-background.xml + # For theme packages + while read theme; do + update-alternatives --remove \ + desktop-lockscreen.xml \ + /usr/share/desktop-base/$theme-theme/lockscreen/gnome-background.xml $priority + done << EOF +softwaves +EOF + + # Remove login theme alternatives + # For active theme + update-alternatives --remove \ + desktop-sddm-preview \ + /usr/share/desktop-base/active-theme/sddm-preview.jpg + update-alternatives --remove \ + desktop-login-background \ + /usr/share/desktop-base/active-theme/backgrounds/login.svg + # For theme packages + # Alternative for theme packages + while read theme; do + update-alternatives --remove \ + desktop-sddm-preview \ + /usr/share/desktop-base/$theme-theme/sddm-preview.jpg + update-alternatives --remove \ + desktop-login-background \ + /usr/share/desktop-base/$theme-theme/backgrounds/login.svg + done << EOF +softwaves +EOF + # For old alternatives ## Lines ### secondary alternatives update-alternatives --remove desktop-sddm-preview \ @@ -60,4 +119,15 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then ; do update-alternatives --remove desktop-grub /usr/share/images/desktop-base/$background done + + # Remove theme package alternatives + while read theme; do + update-alternatives --remove \ + desktop-theme \ + /usr/share/desktop-base/$theme-theme + done << EOF +softwaves +EOF + + update-alternatives --remove desktop-theme / fi diff --git a/sddm-debian/Main.qml b/sddm-debian/Main.qml index 361aa84..7820b6e 100644 --- a/sddm-debian/Main.qml +++ b/sddm-debian/Main.qml @@ -26,6 +26,7 @@ import org.kde.plasma.core 2.0 as PlasmaCore import org.kde.plasma.components 2.0 as PlasmaComponents import org.kde.plasma.extras 2.0 as PlasmaExtras +import "../breeze" import "../breeze/components" PlasmaCore.ColorScope { diff --git a/softwaves-theme/backgrounds/login.svg b/softwaves-theme/backgrounds/login.svg new file mode 100644 index 0000000..5761d8f --- /dev/null +++ b/softwaves-theme/backgrounds/login.svg @@ -0,0 +1,423 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/softwaves-theme/gnome-wp-list-softwaves.xml b/softwaves-theme/gnome-wp-list-softwaves.xml new file mode 100644 index 0000000..4047049 --- /dev/null +++ b/softwaves-theme/gnome-wp-list-softwaves.xml @@ -0,0 +1,20 @@ + + + + + + Soft Waves + /usr/share/desktop-base/softwaves-theme/wallpaper/gnome-background.xml + zoom + #ffffff + #000000 + + + + Soft Waves Lock Screen + /usr/share/desktop-base/softwaves-theme/lockscreen/gnome-background.xml + zoom + #ffffff + #000000 + + diff --git a/softwaves-theme/lockscreen/contents/images/1280x720.svg b/softwaves-theme/lockscreen/contents/images/1280x720.svg new file mode 100644 index 0000000..ba0a644 --- /dev/null +++ b/softwaves-theme/lockscreen/contents/images/1280x720.svg @@ -0,0 +1,432 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/softwaves-theme/lockscreen/contents/images/1920x1080.svg b/softwaves-theme/lockscreen/contents/images/1920x1080.svg new file mode 100644 index 0000000..54eb9e2 --- /dev/null +++ b/softwaves-theme/lockscreen/contents/images/1920x1080.svg @@ -0,0 +1,429 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/softwaves-theme/lockscreen/contents/images/2560x1440.svg b/softwaves-theme/lockscreen/contents/images/2560x1440.svg new file mode 100644 index 0000000..4a3046d --- /dev/null +++ b/softwaves-theme/lockscreen/contents/images/2560x1440.svg @@ -0,0 +1,432 @@ + + + +image/svg+xml \ No newline at end of file diff --git a/softwaves-theme/lockscreen/gnome-background.xml b/softwaves-theme/lockscreen/gnome-background.xml new file mode 100644 index 0000000..d3c689b --- /dev/null +++ b/softwaves-theme/lockscreen/gnome-background.xml @@ -0,0 +1,11 @@ + + + 8640000.0 + + /usr/share/desktop-base/softwaves-theme/lockscreen/contents/images/1280x720.svg + /usr/share/desktop-base/softwaves-theme/lockscreen/contents/images/1920x1080.svg + /usr/share/desktop-base/softwaves-theme/lockscreen/contents/images/2560x1440.svg + + + + diff --git a/softwaves-theme/lockscreen/metadata.desktop b/softwaves-theme/lockscreen/metadata.desktop new file mode 100644 index 0000000..bc0f310 --- /dev/null +++ b/softwaves-theme/lockscreen/metadata.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Soft Waves Lock Screen +Name[fr]=Écran de verrouillage pour Vagues Douces +X-KDE-PluginInfo-Name=SoftWavesLockScreen +X-KDE-PluginInfo-Author=Juliette Taka Belin +X-KDE-PluginInfo-Email=juliettetaka.belin@gmail.com +X-KDE-PluginInfo-License=GPLv2+ diff --git a/softwaves-theme/sddm-preview.jpg b/softwaves-theme/sddm-preview.jpg new file mode 100644 index 0000000..7125edb Binary files /dev/null and b/softwaves-theme/sddm-preview.jpg differ diff --git a/softwaves-theme/wallpaper/contents/images/1280x720.svg b/softwaves-theme/wallpaper/contents/images/1280x720.svg new file mode 100644 index 0000000..fc4b7da --- /dev/null +++ b/softwaves-theme/wallpaper/contents/images/1280x720.svg @@ -0,0 +1,549 @@ + + + +image/svg+xml diff --git a/softwaves-theme/wallpaper/contents/images/1920x1080.svg b/softwaves-theme/wallpaper/contents/images/1920x1080.svg new file mode 100644 index 0000000..be8c05d --- /dev/null +++ b/softwaves-theme/wallpaper/contents/images/1920x1080.svg @@ -0,0 +1,546 @@ + + + +image/svg+xmldebian +GNU/Linux + diff --git a/softwaves-theme/wallpaper/contents/images/2560x1440.svg b/softwaves-theme/wallpaper/contents/images/2560x1440.svg new file mode 100644 index 0000000..ccf8a0c --- /dev/null +++ b/softwaves-theme/wallpaper/contents/images/2560x1440.svg @@ -0,0 +1,549 @@ + + + +image/svg+xml diff --git a/softwaves-theme/wallpaper/gnome-background.xml b/softwaves-theme/wallpaper/gnome-background.xml new file mode 100644 index 0000000..3e1f774 --- /dev/null +++ b/softwaves-theme/wallpaper/gnome-background.xml @@ -0,0 +1,11 @@ + + + 8640000.0 + + /usr/share/desktop-base/softwaves-theme/wallpaper/contents/images/1280x720.svg + /usr/share/desktop-base/softwaves-theme/wallpaper/contents/images/1920x1080.svg + /usr/share/desktop-base/softwaves-theme/wallpaper/contents/images/2560x1440.svg + + + + diff --git a/softwaves-theme/wallpaper/metadata.desktop b/softwaves-theme/wallpaper/metadata.desktop new file mode 100644 index 0000000..503dad6 --- /dev/null +++ b/softwaves-theme/wallpaper/metadata.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Name=Soft Waves +Name[fr]=Vagues Douces +X-KDE-PluginInfo-Name=SoftWaves +X-KDE-PluginInfo-Author=Juliette Taka Belin +X-KDE-PluginInfo-Email=juliettetaka.belin@gmail.com +X-KDE-PluginInfo-License=GPLv2+