More work on theme packs for Joy and Spacefun

debian/README.Debian

@@ -215,7 +215,8 @@ A theme pack should contain the following elements:
 ./login/sddm-preview.jpg
 -> To provide the login background alternative for LightDM, SDDM…
    The SDDM-preview.jpg will make the theme recognizable from the Plasma 5
-   preferences.
+   preferences. To create it, set-up a new alternative, start SDDM, take a
+   screenshot and resize it to a 900x506 pixels JPG.
 
 ./lockscreen/gnome-background.xml
 ./lockscreen/contents/images

debian/changelog

@@ -3,7 +3,7 @@ desktop-base (9.0.0~exp2) UNRELEASED; urgency=medium
   [ Aurélien COUDERC ]
   * Additional wallpaper ratios for Soft Waves theme.
   * Remove Moreblue theme from Lenny.
-  * Move Joy/Spacefun wallpapers to theme pack structure.
+  * Add theme pack support Joy/Spacefun themes.
   * Generate all GRUB bitmaps from SVG at build time instead of versioning
     them.
   * Include GRUB text/background colors in the theme pack / alternatives

debian/postinst

@@ -98,6 +98,8 @@ EOF
     done << EOF
 softwaves 40
 lines 30
+joy 20
+spacefun 20
 EOF
 
     # Set up an alternative for the wallpaper for Plasma 5/KDE
@@ -115,6 +117,9 @@ EOF
     done << EOF
 softwaves 40
 lines 30
+joy 20
+joy-inksplat 20
+spacefun 20
 EOF
 
     # Login theme
@@ -137,6 +142,8 @@ EOF
 softwaves background.svg sddm-preview.jpg 40
 lines background.svg sddm-preview.jpg 30
 lines background-nologo.svg sddm-preview-nologo.jpg 30
+joy background.svg sddm-preview.jpg 20
+spacefun background.svg sddm-preview.jpg 20
 EOF
 
     # Set up an alternative for the GRUB background/colors config

debian/preinst

@@ -109,4 +109,5 @@ EOF
 
     fi
 
+
 fi

debian/prerm

@@ -70,6 +70,8 @@ EOF
     done << EOF
 softwaves
 lines
+joy
+spacefun
 EOF
     # *Last* remove *highest priority* alternative for active theme
     update-alternatives --remove \
@@ -109,6 +111,7 @@ softwaves background.svg sddm-preview.jpg
 lines background.svg sddm-preview.jpg
 lines background-nologo.svg sddm-preview-nologo.jpg
 joy background.svg sddm-preview.jpg
+spacefun background.svg sddm-preview.jpg
 EOF
     # *Last* remove *highest priority* alternative for active theme
     update-alternatives --remove \
@@ -118,8 +121,19 @@ EOF
         desktop-login-background \
         /usr/share/desktop-base/active-theme/login/background.svg
 
-    # Remove grub background alternatives
-    # For theme packages
+    # Remove GRUB alternatives
+    # Remove alternative for the GRUB background/colors config
+    while read theme priority; do
+        update-alternatives --remove \
+            desktop-grub.sh \
+            /usr/share/desktop-base/$theme-theme/grub/grub_background.sh
+    done << EOF
+softwaves
+lines
+joy
+spacefun
+EOF
+    # Remove background alternatives
     while read theme ratio; do
         update-alternatives --remove \
             desktop-grub.sh \
@@ -156,23 +170,6 @@ EOF
         desktop-grub \
         /usr/share/desktop-base/active-theme/grub/grub-$remove_last_ratio.png
 
-    # Remove alternative for the GRUB background/colors config
-    # Alternatives for theme packages
-    while read theme priority; do
-        update-alternatives --remove \
-            desktop-grub.sh \
-            /usr/share/desktop-base/$theme-theme/grub/grub_background.sh
-    done << EOF
-softwaves
-lines
-joy
-spacefun
-EOF
-    # *Lastly* remove *highest priority* alternative
-    update-alternatives --remove \
-        desktop-grub.sh \
-        /usr/share/desktop-base/active-theme/grub/grub_background.sh
-
 
     # Remove theme package alternatives
     while read theme; do