diff --git a/Makefile b/Makefile index d41b006..b677b37 100644 --- a/Makefile +++ b/Makefile @@ -2,7 +2,6 @@ DEFAULT_BACKGROUND=desktop-background INSTALL=install -m 0644 BACKGROUNDS=$(wildcard backgrounds/*.png backgrounds/*.jpg backgrounds/*.svg backgrounds/*.tga backgrounds/*.xml) -SPLASH=$(wildcard splash/*.png splash/*.svg) PIXMAPS=$(wildcard pixmaps/*.png) DESKTOPFILES=$(wildcard *.desktop) @@ -15,8 +14,6 @@ install: mkdir -p $(DESTDIR)/usr/share/images/desktop-base $(INSTALL) $(BACKGROUNDS) $(DESTDIR)/usr/share/images/desktop-base cd $(DESTDIR)/usr/share/images/desktop-base && ln -s $(DEFAULT_BACKGROUND) default - # splash files - $(INSTALL) $(SPLASH) $(DESTDIR)/usr/share/images/desktop-base # emblems mkdir -p $(DESTDIR)/usr/share/icons/hicolor/36x36/emblems $(INSTALL) $(wildcard icons/36x36/emblems/*) $(DESTDIR)/usr/share/icons/hicolor/36x36/emblems @@ -65,34 +62,6 @@ install: $(INSTALL) $(wildcard kde-wallpaper/Lines/contents/images/*) $(DESTDIR)/usr/share/wallpapers/Lines/contents/images/ - # KDM theme - mkdir -p $(DESTDIR)/etc/default/kdm.d - $(INSTALL) kdm-theme/kdm.d/10_desktop-base $(DESTDIR)/etc/default/kdm.d - mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/joy - $(INSTALL) $(wildcard kdm-theme/joy/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/joy - mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/lines - $(INSTALL) $(wildcard kdm-theme/lines/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/lines - - # KSPLASH themes - ## Joy - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy - $(INSTALL) ksplash-theme/joy/Preview.png $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy - $(INSTALL) ksplash-theme/joy/Theme.rc $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1024x768 - $(INSTALL) $(wildcard ksplash-theme/joy/1024x768/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1024x768 - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1280x800 - $(INSTALL) $(wildcard ksplash-theme/joy/1280x800/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1280x800 - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1280x1024 - $(INSTALL) $(wildcard ksplash-theme/joy/1280x1024/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1280x1024 - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1366x768 - $(INSTALL) $(wildcard ksplash-theme/joy/1366x768/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1366x768 - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1600x1200 - $(INSTALL) $(wildcard ksplash-theme/joy/1600x1200/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1600x1200 - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1080 - $(INSTALL) $(wildcard ksplash-theme/joy/1920x1080/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1080 - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1200 - $(INSTALL) $(wildcard ksplash-theme/joy/1920x1200/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/joy/1920x1200 - ## SDDM meta theme (configured with alternatives) install -d $(DESTDIR)/usr/share/sddm/themes/debian-theme $(INSTALL) $(wildcard sddm-debian/*) $(DESTDIR)/usr/share/sddm/themes/debian-theme @@ -105,11 +74,11 @@ install: $(INSTALL) lines-theme/login-background-with-logo.svg $(DESTDIR)/usr/share/desktop-base/lines-theme/ $(INSTALL) lines-theme/sddm-preview.jpg $(DESTDIR)/usr/share/desktop-base/lines-theme/ - install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/lines/images - $(INSTALL) $(wildcard ksplash-theme/lines/*.qml) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/lines - $(INSTALL) $(wildcard ksplash-theme/lines/*.png) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/lines - $(INSTALL) $(wildcard ksplash-theme/lines/*.rc) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/lines - $(INSTALL) $(wildcard ksplash-theme/lines/images/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/lines/images + ## Joy + install -d $(DESTDIR)/usr/share/desktop-base/joy-theme + # login background + $(INSTALL) joy-theme/login-background.svg $(DESTDIR)/usr/share/desktop-base/joy-theme/ + $(INSTALL) joy-theme/sddm-preview.jpg $(DESTDIR)/usr/share/desktop-base/joy-theme/ # Xfce 4.6 diff --git a/debian/README.Debian b/debian/README.Debian index 911b4e6..9286948 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -4,7 +4,7 @@ README for desktop-base 1. Images 1.1. Emblems 1.2. Pixmaps - 1.3. Splash and Wallpapers + 1.3. Wallpapers 1.4. Boot splash 2. Desktop files 3. Changing desktop-base images @@ -31,9 +31,6 @@ automatically reverted to the default choice. For wallpaper you can run: sudo update-alternatives --config desktop-background -For splash screens you can run: - sudo update-alternatives --config desktop-splash - For login screen (only SDDM for now) you can run: sudo update-alternatives --config desktop-login-background diff --git a/debian/changelog b/debian/changelog index 2157808..d547aa8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -11,6 +11,8 @@ desktop-base (9.0.0~exp1) UNRELEASED; urgency=medium - Based on default SDDM theme breeze + Debian theme background. - Can be configured with alternatives (also works in lightdm). (Closes: #415064, #608523, #611170, #670866, #762276) + * Remove deprecated ksplash and kdm from KDE4. (Closes: #607842) + * Remove deprecated splash options from Gnome 2. -- Coucouf Tue, 06 Sep 2016 08:14:12 +0200 diff --git a/debian/postinst b/debian/postinst index 3b88ba2..a5e397a 100644 --- a/debian/postinst +++ b/debian/postinst @@ -39,20 +39,10 @@ EOF done << EOF lines.xml 20 joy.xml 10 -EOF - - # Alternatives for the splash - while read splash priority; do - update-alternatives --install \ - /usr/share/images/desktop-base/desktop-splash \ - desktop-splash \ - /usr/share/images/desktop-base/$splash $priority - done << EOF -spacefun-splash.svg 50 -moreblue-orbit-splash.png 40 EOF # Login theme + ## 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 \ @@ -65,6 +55,13 @@ EOF --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 \ + --slave /usr/share/sddm/themes/debian-theme/sddm-preview.jpg \ + desktop-sddm-preview \ + /usr/share/desktop-base/joy-theme/sddm-preview.jpg # Alternatives for grub ## Favor widescreen / hi-res background for efi installations diff --git a/debian/prerm b/debian/prerm index fcff04f..e6fb79a 100644 --- a/debian/prerm +++ b/debian/prerm @@ -33,23 +33,22 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then done # remove login theme alternatives - # secondaire alternatives + ## Lines + ### secondary alternatives update-alternatives --remove desktop-sddm-preview \ /usr/share/desktop-base/lines-theme/sddm-preview.jpg - # main alternatives + ### main alternatives update-alternatives --remove desktop-login-background \ /usr/share/desktop-base/lines-theme/login-background.svg update-alternatives --remove desktop-login-background \ /usr/share/desktop-base/lines-theme/login-background-no-logo.svg - - - # remove splash alternatives - for splash in \ - spacefun-splash.svg \ - moreblue-orbit-splash.png \ - ; do - update-alternatives --remove desktop-splash /usr/share/images/desktop-base/$splash - done + ## Joy + ### secondary alternatives + update-alternatives --remove desktop-sddm-preview \ + /usr/share/desktop-base/joy-theme/sddm-preview.jpg + ### main alternatives + update-alternatives --remove desktop-login-background \ + /usr/share/desktop-base/joy-theme/login-background.svg # remove grub alternatives for background in \ diff --git a/kdm-theme/joy/background.svg b/joy-theme/login-background.svg similarity index 100% rename from kdm-theme/joy/background.svg rename to joy-theme/login-background.svg diff --git a/joy-theme/sddm-preview.jpg b/joy-theme/sddm-preview.jpg new file mode 100644 index 0000000..1d30410 Binary files /dev/null and b/joy-theme/sddm-preview.jpg differ diff --git a/kdm-theme/joy/KdmGreeterTheme.desktop b/kdm-theme/joy/KdmGreeterTheme.desktop deleted file mode 100644 index bb586dd..0000000 --- a/kdm-theme/joy/KdmGreeterTheme.desktop +++ /dev/null @@ -1,8 +0,0 @@ -[KdmGreeterTheme] -Encoding=UTF-8 -Greeter=joy.xml -Name=Joy -Description=Joy KDM Theme -Author=Eshat Cakar, Adrien Aubourg -Copyright=(c) 2012 Eshat Cakar , (c) 2010 Roman Shtylman , Adrien Aubourg -Screenshot=screenshot.png diff --git a/kdm-theme/joy/joy.xml b/kdm-theme/joy/joy.xml deleted file mode 100644 index 251d62b..0000000 --- a/kdm-theme/joy/joy.xml +++ /dev/null @@ -1,138 +0,0 @@ - - - - -