diff --git a/Makefile b/Makefile
index 3269d23..e1eb6ce 100644
--- a/Makefile
+++ b/Makefile
@@ -66,6 +66,9 @@ install-local:
# Space Fun theme (Squeeze’s default)
+ ### 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
### Wallpapers
install -d $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper/contents/images
$(INSTALL) spacefun-theme/wallpaper/metadata.desktop $(DESTDIR)/usr/share/desktop-base/spacefun-theme/wallpaper
diff --git a/debian/README.Debian b/debian/README.Debian
index fdcb15c..ad3d0dc 100644
--- a/debian/README.Debian
+++ b/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
diff --git a/debian/changelog b/debian/changelog
index 2f981e4..b9880bc 100644
--- a/debian/changelog
+++ b/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
diff --git a/debian/postinst b/debian/postinst
index c729eef..220afc1 100644
--- a/debian/postinst
+++ b/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
diff --git a/debian/preinst b/debian/preinst
index 3d9843b..aa621a4 100644
--- a/debian/preinst
+++ b/debian/preinst
@@ -109,4 +109,5 @@ EOF
fi
+
fi
diff --git a/debian/prerm b/debian/prerm
index d97d9dc..216f1aa 100644
--- a/debian/prerm
+++ b/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
diff --git a/sddm-debian/metadata.desktop b/sddm-debian/metadata.desktop
index 79f31f5..206389c 100644
--- a/sddm-debian/metadata.desktop
+++ b/sddm-debian/metadata.desktop
@@ -1,8 +1,8 @@
[SddmGreeterTheme]
-Name=Debian Theme
-Name[fr]=Thème Debian
-Description=Debian theme based on Plasma Breeze theme and powered by alternatives system
-Description[fr]=Thème Debian basé sur le thème Plasma Breeze et configurables par le sytème d’alternatives
+Name=Debian Breeze
+Name[fr]=Debian Brise
+Description=Debian theme based on Breeze
+Description[fr]=Thème Debian basé sur Brise
Type=sddm-theme
Version=0.1
Screenshot=sddm-preview.jpg
diff --git a/spacefun-theme/login/background.svg b/spacefun-theme/login/background.svg
new file mode 100644
index 0000000..6eb916a
--- /dev/null
+++ b/spacefun-theme/login/background.svg
@@ -0,0 +1,844 @@
+
+
+
+
diff --git a/spacefun-theme/login/sddm-preview.jpg b/spacefun-theme/login/sddm-preview.jpg
new file mode 100644
index 0000000..9990671
Binary files /dev/null and b/spacefun-theme/login/sddm-preview.jpg differ
diff --git a/spacefun-theme/wallpaper/contents/images/1280x1024.svg b/spacefun-theme/wallpaper/contents/images/1280x1024.svg
index 38acd88..30d3cbf 100644
--- a/spacefun-theme/wallpaper/contents/images/1280x1024.svg
+++ b/spacefun-theme/wallpaper/contents/images/1280x1024.svg
@@ -454,9 +454,9 @@
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
- inkscape:zoom="0.43142361"
- inkscape:cx="782.69492"
- inkscape:cy="491.76552"
+ inkscape:zoom="0.86284722"
+ inkscape:cx="649.81504"
+ inkscape:cy="485.42988"
inkscape:current-layer="layer1"
inkscape:document-units="px"
showgrid="false"
@@ -1486,13 +1486,13 @@
inkscape:rounded="0"
inkscape:randomized="0"
d="M 60.073357,40.642872 41.322522,28.618571 33.200663,49.360148 38.842126,27.811331 16.605922,26.496484 38.843372,25.202884 33.222502,3.6486861 41.324539,24.398014 60.086854,12.391635 42.856737,26.509025 Z"
- transform="translate(0,48)"
+ transform="matrix(0.89034664,0,0,0.89034664,4.2048101,50.906299)"
inkscape:transform-center-x="2.2914716"
inkscape:transform-center-y="-0.0035479466" />