[debian-edu-commits] debian-edu/ 04/04: Make d-e-a-spacefun work with desktop-base 9.0.0 too, but using PNG files except for the desktop-login-background (SVG file available).

Wolfgang Schweer schweer-guest at moszumanska.debian.org
Wed Dec 14 18:44:57 UTC 2016


This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-artwork.

commit 5b1b56d19562cf6f40dfa701b6400ea58f72891a
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Dec 14 19:41:44 2016 +0100

    Make d-e-a-spacefun work with desktop-base 9.0.0 too, but using PNG files
    except for the desktop-login-background (SVG file available).
---
 art-spacefun/desktop-base/1280x1024.png            | Bin 45 -> 519641 bytes
 art-spacefun/desktop-base/1600x1200.png            | Bin 45 -> 478100 bytes
 art-spacefun/desktop-base/1920x1080.png            | Bin 45 -> 1082819 bytes
 art-spacefun/desktop-base/1920x1200.png            | Bin 45 -> 1208769 bytes
 art-spacefun/desktop-base/Makefile.am              |  51 +++---
 ...un-wallpaper01_1600x1200.svg => background.svg} |   0
 .../debian-edu-spacefun-wallpaper.png.desktop      |   7 -
 .../debian-edu-spacefun-wallpaper01_1280x1024.png  | Bin 519641 -> 0 bytes
 .../debian-edu-spacefun-wallpaper01_1600x1200.png  | Bin 478100 -> 0 bytes
 .../debian-edu-spacefun-wallpaper01_1920x1080.png  | Bin 1082819 -> 0 bytes
 .../debian-edu-spacefun-wallpaper01_1920x1200.png  | Bin 1208769 -> 0 bytes
 art-spacefun/desktop-base/debian-edu-spacefun.xml  |  11 --
 art-spacefun/desktop-base/gnome-background.xml     |  14 ++
 art-spacefun/desktop-base/grub-16x9.png            | Bin 0 -> 88358 bytes
 .../{debian-edu-spacefun-grub.png => grub-4x3.png} | Bin
 art-spacefun/desktop-base/grub_background.sh       |   3 +
 art-spacefun/desktop-base/screenshot.png           | Bin 195613 -> 0 bytes
 art-spacefun/g-i/Makefile.am                       |   2 +-
 art-spacefun/ldm/preview.png                       | Bin 340567 -> 0 bytes
 debian/changelog                                   |   3 +
 debian/debian-edu-artwork-spacefun.install         |   3 +-
 debian/update-debian-edu-artwork-spacefun          | 185 ++++++++++++---------
 .../debian-edu-spacefun-installer-logo.xcf         | Bin
 23 files changed, 149 insertions(+), 130 deletions(-)

diff --git a/art-spacefun/desktop-base/1280x1024.png b/art-spacefun/desktop-base/1280x1024.png
deleted file mode 120000
index 449a245..0000000
--- a/art-spacefun/desktop-base/1280x1024.png
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu-spacefun-wallpaper01_1280x1024.png
\ No newline at end of file
diff --git a/art-spacefun/desktop-base/1280x1024.png b/art-spacefun/desktop-base/1280x1024.png
new file mode 100644
index 0000000..bff4164
Binary files /dev/null and b/art-spacefun/desktop-base/1280x1024.png differ
diff --git a/art-spacefun/desktop-base/1600x1200.png b/art-spacefun/desktop-base/1600x1200.png
deleted file mode 120000
index 7a69010..0000000
--- a/art-spacefun/desktop-base/1600x1200.png
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu-spacefun-wallpaper01_1600x1200.png
\ No newline at end of file
diff --git a/art-spacefun/desktop-base/1600x1200.png b/art-spacefun/desktop-base/1600x1200.png
new file mode 100644
index 0000000..f88119a
Binary files /dev/null and b/art-spacefun/desktop-base/1600x1200.png differ
diff --git a/art-spacefun/desktop-base/1920x1080.png b/art-spacefun/desktop-base/1920x1080.png
deleted file mode 120000
index ae65ce1..0000000
--- a/art-spacefun/desktop-base/1920x1080.png
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu-spacefun-wallpaper01_1920x1080.png
\ No newline at end of file
diff --git a/art-spacefun/desktop-base/1920x1080.png b/art-spacefun/desktop-base/1920x1080.png
new file mode 100644
index 0000000..456755f
Binary files /dev/null and b/art-spacefun/desktop-base/1920x1080.png differ
diff --git a/art-spacefun/desktop-base/1920x1200.png b/art-spacefun/desktop-base/1920x1200.png
deleted file mode 120000
index 75a2d5d..0000000
--- a/art-spacefun/desktop-base/1920x1200.png
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu-spacefun-wallpaper01_1920x1200.png
\ No newline at end of file
diff --git a/art-spacefun/desktop-base/1920x1200.png b/art-spacefun/desktop-base/1920x1200.png
new file mode 100644
index 0000000..8120c95
Binary files /dev/null and b/art-spacefun/desktop-base/1920x1200.png differ
diff --git a/art-spacefun/desktop-base/Makefile.am b/art-spacefun/desktop-base/Makefile.am
index 22c9003..69005a5 100644
--- a/art-spacefun/desktop-base/Makefile.am
+++ b/art-spacefun/desktop-base/Makefile.am
@@ -1,14 +1,6 @@
 THEME = spacefun
-THEMECONTENT = Spacefun
-DESKTOPBASEIMG = \
-	debian-edu-spacefun-wallpaper01_1280x1024.png \
-	debian-edu-spacefun-wallpaper01_1600x1200.png \
-	debian-edu-spacefun-wallpaper01_1920x1080.png \
-	debian-edu-spacefun-wallpaper01_1920x1200.png \
-	debian-edu-spacefun-wallpaper01_1600x1200.svg \
-	debian-edu-spacefun-grub.png
-
-EDUIMG = 1024x768.png \
+WALLPAPERIMG = \
+	1024x768.png \
 	1280x1024.png \
 	1280x800.png \
 	1366x768.png \
@@ -16,26 +8,33 @@ EDUIMG = 1024x768.png \
 	1920x1080.png \
 	1920x1200.png
 
-desktopbaseimgdir = $(datadir)/images/desktop-base
-desktopbaseimg_DATA = $(DESKTOPBASEIMG) debian-edu-$(THEME).xml
+LOGINIMG = background.svg
 
-kdeplasmadir = $(datadir)/debian-edu-artwork-spacefun/kde4/apps/plasma-desktop/init/
-kdeplasma_DATA = 20-desktop-base-edu.js
+GRUBIMG = \
+	grub-4x3.png \
+	grub-16x9.png
+
+wallpaperdir = $(datadir)/desktop-base/debian-edu-$(THEME)-theme/wallpaper/
+wallpaper_DATA = gnome-background.xml metadata.desktop
 
-edudir = $(datadir)/wallpapers/Debian-Edu-$(THEMECONTENT)/
-edu_DATA = metadata.desktop
+wallpaperimgdir = $(datadir)/desktop-base/debian-edu-$(THEME)-theme/wallpaper/contents/images/
+wallpaperimg_DATA = $(WALLPAPERIMG)
 
-educontentsdir = $(datadir)/wallpapers/Debian-Edu-Spacefun/contents/
-educontents_DATA = screenshot.png
+loginimgdir = $(datadir)/desktop-base/debian-edu-$(THEME)-theme/login/
+loginimg_DATA = $(LOGINIMG)
 
-eduimgdir = $(datadir)/wallpapers/Debian-Edu-Spacefun/contents/images/
-eduimg_DATA = $(EDUIMG)
+grubimgdir = $(datadir)/desktop-base/debian-edu-$(THEME)-theme/grub/
+grubimg_DATA = $(GRUBIMG) grub_background.sh
+
+kdeplasmadir = $(datadir)/debian-edu-artwork-$(THEME)/kde4/apps/plasma-desktop/init/
+kdeplasma_DATA = 20-desktop-base-edu.js
 
 install-data-local:
-	$(mkinstalldirs) $(DESTDIR)$(desktopbaseimgdir)
-	$(mkinstalldirs) $(DESTDIR)$(edudir)
-	$(mkinstalldirs) $(DESTDIR)$(educontentsdir)
-	$(mkinstalldirs) $(DESTDIR)$(eduimgdir)
-	$(mkinstalldirs) $(DESTDIR)$(Xsessiondir)
 
-EXTRA_DIST = $(desktopbaseimg_DATA) $(edu_DATA) $(educontents_DATA) $(eduimg_DATA) $(kdeplasma_DATA)
+	$(mkinstalldirs) $(DESTDIR)$(wallpaperdir)
+	$(mkinstalldirs) $(DESTDIR)$(wallpaperimgdir)
+	$(mkinstalldirs) $(DESTDIR)$(loginimgdir)
+	$(mkinstalldirs) $(DESTDIR)$(grubimgdir)
+	$(mkinstalldirs) $(DESTDIR)$(kdeplasmadir)
+
+EXTRA_DIST = $(wallpaper_DATA) $(wallpaperimg_DATA) $(loginimg_DATA) $(grubimg_DATA) $(kdeplasma_DATA)
diff --git a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1600x1200.svg b/art-spacefun/desktop-base/background.svg
similarity index 100%
rename from art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1600x1200.svg
rename to art-spacefun/desktop-base/background.svg
diff --git a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper.png.desktop b/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper.png.desktop
deleted file mode 100644
index 4e2b4bc..0000000
--- a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper.png.desktop
+++ /dev/null
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Debian-Edu-Spacefun
-
-X-KDE-PluginInfo-Name=Debian Edu Spacefun
-X-KDE-PluginInfo-Author=Christoph Muetze <gizmo at pixelz.de>
-X-KDE-PluginInfo-Email=debian-edu at lists.debian.org
-X-KDE-PluginInfo-License=GPLv2+
diff --git a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1280x1024.png b/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1280x1024.png
deleted file mode 100644
index bff4164..0000000
Binary files a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1280x1024.png and /dev/null differ
diff --git a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1600x1200.png b/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1600x1200.png
deleted file mode 100644
index f88119a..0000000
Binary files a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1600x1200.png and /dev/null differ
diff --git a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1920x1080.png b/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1920x1080.png
deleted file mode 100644
index 456755f..0000000
Binary files a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1920x1080.png and /dev/null differ
diff --git a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1920x1200.png b/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1920x1200.png
deleted file mode 100644
index 8120c95..0000000
Binary files a/art-spacefun/desktop-base/debian-edu-spacefun-wallpaper01_1920x1200.png and /dev/null differ
diff --git a/art-spacefun/desktop-base/debian-edu-spacefun.xml b/art-spacefun/desktop-base/debian-edu-spacefun.xml
deleted file mode 100644
index 9c4be2f..0000000
--- a/art-spacefun/desktop-base/debian-edu-spacefun.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<background>
-  <static>
-    <duration>8640000.0</duration>
-    <file>
-      <size width="1280" height="1024">/usr/share/images/desktop-base/debian-edu-spacefun-wallpaper01_1280x1024.png</size>
-      <size width="1600" height="1200">/usr/share/images/desktop-base/debian-edu-spacefun-wallpaper01_1600x1200.png</size>
-      <size width="1920" height="1080">/usr/share/images/desktop-base/debian-edu-spacefun-wallpaper01_1920x1080.png</size>
-      <size width="1920" height="1200">/usr/share/images/desktop-base/debian-edu-spacefun-wallpaper01_1920x1200.png</size>
-    </file>
-  </static>
-</background>
diff --git a/art-spacefun/desktop-base/gnome-background.xml b/art-spacefun/desktop-base/gnome-background.xml
new file mode 100644
index 0000000..9c1b07d
--- /dev/null
+++ b/art-spacefun/desktop-base/gnome-background.xml
@@ -0,0 +1,14 @@
+<background>
+  <static>
+    <duration>8640000.0</duration>
+    <file>
+      <size width="1024" height="768">/usr/share/desktop-base/debian-edu-softwaves-theme/content/images/1024x768.png</size>
+      <size width="1280" height="1024">/usr/share/desktop-base/debian-edu-softwaves-theme/content/images/1280x1024.png</size>
+      <size width="1280" height="800">/usr/share/desktop-base/debian-edu-softwaves-theme/content/images/1280x800.png</size>
+      <size width="1366" height="768">/usr/share/desktop-base/debian-edu-softwaves-theme/content/images/1366x768.png</size>
+      <size width="1600" height="1200">/usr/share/desktop-base/debian-edu-softwaves-theme/content/images/1600x1200.png</size>
+      <size width="1920" height="1080">/usr/share/desktop-base/debian-edu-softwaves-theme/content/images/1920x1080.png</size>
+      <size width="1920" height="1200">/usr/share/desktop-base/debian-edu-softwaves-theme/content/images/1920x1200.png</size>
+    </file>
+  </static>
+</background>
diff --git a/art-spacefun/desktop-base/grub-16x9.png b/art-spacefun/desktop-base/grub-16x9.png
new file mode 100644
index 0000000..8aa6f11
Binary files /dev/null and b/art-spacefun/desktop-base/grub-16x9.png differ
diff --git a/art-spacefun/desktop-base/debian-edu-spacefun-grub.png b/art-spacefun/desktop-base/grub-4x3.png
similarity index 100%
rename from art-spacefun/desktop-base/debian-edu-spacefun-grub.png
rename to art-spacefun/desktop-base/grub-4x3.png
diff --git a/art-spacefun/desktop-base/grub_background.sh b/art-spacefun/desktop-base/grub_background.sh
new file mode 100644
index 0000000..c7ba469
--- /dev/null
+++ b/art-spacefun/desktop-base/grub_background.sh
@@ -0,0 +1,3 @@
+WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png
+COLOR_NORMAL=white/black
+COLOR_HIGHLIGHT=black/white
diff --git a/art-spacefun/desktop-base/screenshot.png b/art-spacefun/desktop-base/screenshot.png
deleted file mode 100644
index 0bd5d6f..0000000
Binary files a/art-spacefun/desktop-base/screenshot.png and /dev/null differ
diff --git a/art-spacefun/g-i/Makefile.am b/art-spacefun/g-i/Makefile.am
index fbad917..4db3451 100644
--- a/art-spacefun/g-i/Makefile.am
+++ b/art-spacefun/g-i/Makefile.am
@@ -5,4 +5,4 @@ logo_DATA = debian-edu-spacefun-installer-logo.png
 install-data-local:
 	$(mkinstalldirs) $(DESTDIR)$(logodir)
 
-EXTRA_DIST = README $(logo_DATA) debian-edu-installer-logo.xcf
+EXTRA_DIST = README $(logo_DATA)
diff --git a/art-spacefun/ldm/preview.png b/art-spacefun/ldm/preview.png
deleted file mode 100644
index a03c028..0000000
Binary files a/art-spacefun/ldm/preview.png and /dev/null differ
diff --git a/debian/changelog b/debian/changelog
index 23cc016..955b576 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ debian-edu-artwork (0.902-1) UNRELEASED; urgency=medium
   * Bump version to 0.902-1.
   * Fix debian-edu-artwork.(postinst|postrm); thanks again to Andreas Beckmann
     for hints and explanations. (Closes: #847279).
+  * Make d-e-a depend upon desktop-base version >= 9.0.0.
   * Make d-e-a and d-e-a-(lines|softwaves) compatible with desktop-base 9.0.0.
     - Use structure similar to desktop-base for d-e-a-(lines|softwaves).
     - Drop playground/stretch, put everything needed into art-softwaves.
@@ -13,6 +14,8 @@ debian-edu-artwork (0.902-1) UNRELEASED; urgency=medium
     - Drop diversion for the desktop-login-background.svg, use alternatives.
     - Add alternatives configuration for desktop-theme and desktop-grub.
     - Make sure that no longer needed symlinks get removed upon upgrades.
+  * Make d-e-a-spacefun work with desktop-base 9.0.0 too, but using PNG files
+    except for the desktop-login-background (SVG file available).
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 12 Dec 2016 23:26:47 +0100
 
diff --git a/debian/debian-edu-artwork-spacefun.install b/debian/debian-edu-artwork-spacefun.install
index 7c1d465..102f1ff 100644
--- a/debian/debian-edu-artwork-spacefun.install
+++ b/debian/debian-edu-artwork-spacefun.install
@@ -1,8 +1,7 @@
 usr/share/debian-edu-artwork-spacefun/
-usr/share/images/desktop-base/debian-edu-spacefun*
+usr/share/desktop-base/debian-edu-spacefun-theme/
 usr/share/ldm/themes/debian-edu-spacefun/
 usr/share/pixmaps/debian-edu-spacefun*
 usr/share/plymouth/themes/debian-edu-spacefun/
-usr/share/wallpapers/Debian-Edu-Spacefun/
 debian/update-debian-edu-artwork-spacefun /usr/sbin/
 usr/share/gnome-shell/theme/debian-edu-spacefun*
diff --git a/debian/update-debian-edu-artwork-spacefun b/debian/update-debian-edu-artwork-spacefun
index 44a52cf..40c66f7 100755
--- a/debian/update-debian-edu-artwork-spacefun
+++ b/debian/update-debian-edu-artwork-spacefun
@@ -3,127 +3,148 @@ set -e
 
 EDUTHEME="spacefun"
 
+set_active_theme() {
+    update-alternatives --install \
+        /usr/share/desktop-base/active-theme \
+        desktop-theme \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme 60
+}
+
+restore_active_theme() {
+    update-alternatives --remove \
+        desktop-theme \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme
+}
+
 change_ldm_background() {
-	update-alternatives --install /usr/share/ldm/themes/default \
-	    ldm-theme /usr/share/ldm/themes/debian-edu-${EDUTHEME} 85
+    update-alternatives --install /usr/share/ldm/themes/default \
+        ldm-theme /usr/share/ldm/themes/debian-edu-${EDUTHEME} 85
 }
 
 restore_ldm_background() {
-	update-alternatives --remove ldm-theme /usr/share/ldm/themes/debian-edu-${EDUTHEME}
+    update-alternatives --remove ldm-theme /usr/share/ldm/themes/debian-edu-${EDUTHEME}
 }
 
-
 ## GRUB and PXE boot background
 change_grub_background() {
-	update-alternatives --install \
-	    /usr/share/images/desktop-base/desktop-grub.png \
-	    desktop-grub \
-	    /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub.png 30
-	ln -sf debian-edu-${EDUTHEME}-grub.png /usr/share/images/desktop-base/debian-edu-pxe.png
-	if which update-grub > /dev/null ; then
-		sync
-		update-grub || true
-	fi
+    update-alternatives --install /usr/share/images/desktop-base/desktop-grub.png \
+        desktop-grub \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/grub/grub-4x3.png 40 \
+        --slave /usr/share/desktop-base/grub_background.sh \
+        desktop-grub.sh \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/grub/grub_background.sh
+    update-alternatives --install /usr/share/images/desktop-base/desktop-grub.png \
+        desktop-grub \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/grub/grub-16x9.png 40 \
+        --slave /usr/share/desktop-base/grub_background.sh \
+        desktop-grub.sh \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/grub/grub_background.sh
+    if which update-grub > /dev/null ; then
+        sync
+        update-grub || true
+    fi
 }
 
 restore_grub_background() {
-	update-alternatives --remove desktop-grub \
-	    /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-grub.png
-	rm -f /usr/share/images/desktop-base/debian-edu-pxe.png
-	if which update-grub > /dev/null ; then
-		update-grub || true
-	fi
+    update-alternatives --remove desktop-grub \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/grub/grub-4x3.png
+    update-alternatives --remove desktop-grub \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/grub/grub-16x9.png
+    if which update-grub > /dev/null ; then
+        update-grub || true
+    fi
 }
 
 ## Wallpaper
 change_desktop_background() {
-	update-alternatives --install \
-	    /usr/share/images/desktop-base/desktop-background \
-	    desktop-background \
-	    /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png 75
-	update-alternatives --install \
-	    /usr/share/images/desktop-base/desktop-background.xml \
-	    desktop-background.xml \
-	    /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml 30
-	for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
-	                 debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg \
-	                 debian-edu-${EDUTHEME}-wallpaper01_1600x1200.png \
-	                 debian-edu-${EDUTHEME}-wallpaper01_1920x1200.png; do
-		update-alternatives --install \
-		    /usr/share/images/desktop-base/desktop-background \
-		    desktop-background \
-		    /usr/share/images/desktop-base/$WALLPAPER 50
-	done
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-background \
+        desktop-background \
+        /usr/share/desktop-base/active-theme/wallpaper/contents/images/1920x1080.png 70
+    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
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-background.xml \
+        desktop-background.xml \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/gnome-background.xml 50
+
+    for WALLPAPER in 1024x768.png \
+                     1280x1024.png \
+                     1280x800.png \
+                     1366x768.png \
+                     1600x1200.png \
+                     1920x1080.png \
+                     1920x1200.png; do
+    update-alternatives --install \
+        /usr/share/images/desktop-base/desktop-background \
+        desktop-background \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/contents/images/$WALLPAPER 50
+    done
 }
 
 restore_desktop_background() {
-	update-alternatives --remove \
-	    desktop-background \
-	    /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png
-	update-alternatives --remove \
-	    desktop-background.xml \
-	    /usr/share/images/desktop-base/debian-edu-${EDUTHEME}.xml
-
-	for WALLPAPER in debian-edu-${EDUTHEME}-wallpaper01_1280x1024.png \
-	                 debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg \
-	                 debian-edu-${EDUTHEME}-wallpaper01_1600x1200.png \
-	                 debian-edu-${EDUTHEME}-wallpaper01_1920x1080.png \
-	                 debian-edu-${EDUTHEME}-wallpaper01_1920x1200.png; do
-		update-alternatives --remove desktop-background \
-		    /usr/share/images/desktop-base/$WALLPAPER
-	done
+    update-alternatives --remove \
+        desktop-background \
+        /usr/share/desktop-base/active-theme/wallpaper/contents/images/1920x1080.png
+    update-alternatives --remove \
+        desktop-background.xml \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/gnome-background.xml
+
+    for WALLPAPER in 1024x768.png \
+                     1280x1024.png \
+                     1280x800.png \
+                     1366x768.png \
+                     1600x1200.png \
+                     1920x1080.png \
+                     1920x1200.png; do
+    update-alternatives --remove \
+        desktop-background \
+        /usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/contents/images/$WALLPAPER
+    done
 }
 
 ## Wallpaper
 compile_gschemas() {
-	if [ -d /usr/share/glib-2.0/schemas/ ] && [ -x /usr/bin/glib-compile-schemas ]; then
-		glib-compile-schemas /usr/share/glib-2.0/schemas/
-	fi
-}
-
-symlink_login_background() {
-	if [ -f /usr/share/images/desktop-base/login-background.svg.edu-diverted ]; then
-		ln -fs /usr/share/images/desktop-base/debian-edu-${EDUTHEME}-wallpaper01_1600x1200.svg /usr/share/images/desktop-base/login-background.svg
-	fi
-}
-
-unlink_login_background() {
-	if [ -h /usr/share/images/desktop-base/login-background.svg ] ; then
-		rm -f /usr/share/images/desktop-base/login-background.svg
-	fi
+    if [ -d /usr/share/glib-2.0/schemas/ ] && [ -x /usr/bin/glib-compile-schemas ]; then
+        glib-compile-schemas /usr/share/glib-2.0/schemas/
+    fi
 }
 
 symlink_gnome_shell_css() {
     if [ -f /usr/share/gnome-shell/theme/gnome-shell.css.edu-diverted ]; then
-	ln -fs /usr/share/gnome-shell/theme/debian-edu-${EDUTHEME}-gnome-shell.css /usr/share/gnome-shell/theme/gnome-shell.css
+        ln -fs /usr/share/gnome-shell/theme/debian-edu-${EDUTHEME}-gnome-shell.css /usr/share/gnome-shell/theme/gnome-shell.css
     fi
 }
 
 unlink_gnome_shell_css() {
     if [ -h /usr/share/gnome-shell/theme/gnome-shell.css ] && \
-       [ "$(readlink /usr/share/gnome-shell/theme/gnome-shell.css)" = "/usr/share/gnome-shell/theme/debian-edu-${EDUTHEME}-gnome-shell.css" ]; then
-	rm -f /usr/share/gnome-shell/theme/gnome-shell.css
+        [ "$(readlink /usr/share/gnome-shell/theme/gnome-shell.css)" = "/usr/share/gnome-shell/theme/debian-edu-${EDUTHEME}-gnome-shell.css" ]; then
+        rm -f /usr/share/gnome-shell/theme/gnome-shell.css
     fi
 }
 
 symlink_kde_base_edu_js() {
-	if [ -f /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ]; then
-		ln -fs /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/kde4/apps/plasma-desktop/init/
-	fi
+    if [ -f /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
+        [ -d /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/ ]; then
+        ln -fs /usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/
+    fi
 }
 
 unlink_kde_base_edu_js() {
-	if [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
-	   [ "$(readlink /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
-		rm -f /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js
-	fi
+    if [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
+        [ -h /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js ] && \
+        [ "$(readlink /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates//20-desktop-base-edu.js)" = "/usr/share/debian-edu-artwork-${EDUTHEME}/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js" ]; then
+        rm -f /usr/share/kde4/apps/plasma-desktop/init/20-desktop-base-edu.js
+    fi
 }
 
 ## Plymouth
 set_plymouth_theme() {
-	if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
-		plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
-	fi
+    if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
+        plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
+    fi
 }
 
 case "$1" in
@@ -134,23 +155,21 @@ case "$1" in
 		if [ -x /usr/sbin/update-debian-edu-artwork-lines ]; then
 			update-debian-edu-artwork-lines remove
 		fi
-		unlink_login_background
+		set_active_theme
 		change_ldm_background
 		change_grub_background
 		change_desktop_background
 		compile_gschemas
 		set_plymouth_theme
-		symlink_login_background
 		symlink_kde_base_edu_js
 		symlink_gnome_shell_css
 	;;
 	remove)
-		unlink_login_background
+		restore_active_theme
 		restore_ldm_background
 		restore_grub_background
 		restore_desktop_background
 		compile_gschemas
-		unlink_login_background
 		unlink_kde_base_edu_js
 		unlink_gnome_shell_css
 	;;
diff --git a/art-spacefun/g-i/debian-edu-spacefun-installer-logo.xcf b/playground/squeeze/debian-edu-spacefun-installer-logo.xcf
similarity index 100%
rename from art-spacefun/g-i/debian-edu-spacefun-installer-logo.xcf
rename to playground/squeeze/debian-edu-spacefun-installer-logo.xcf

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git



More information about the debian-edu-commits mailing list