Package: release.debian.org
Severity: normal
Tags: bookworm
User: release.debian....@packages.debian.org
Usertags: pu
X-Debbugs-Cc: debian-edu-artw...@packages.debian.org,
debian-...@lists.debian.org
Control: affects -1 + src:debian-edu-artwork
Please accept an upstream version bump of the debian-edu-artwork package
uploaded to Debian bookworm(-pu).
The previous d-e-a version contained only dummy Debian Edu 12 artwork, by
simply having copied over the Debian Edu 11 artwork files into the
bin:pkg debian-edu-artwork-emerald. This was only done (long year
practice) to get the d-e-a-emerald bin:pkg into Debian 12 before the
release freeze.
Now, we finally get to providing the real Debian Edu 12 artwork with this
upload to bookworm.
[ Reason ]
See above. Artwork files for Debian Edu 12 adjusted so they actually look like
the Emerald theme, but branded for Debian Edu.
[ Impact ]
If not accepted, Debian Edu 12 will look like Debian Edu 11.
[ Tests ]
Manually.
[ Risks ]
For most Debian users: none. For Debian Edu users, the artwork files and
script might have flaws that we have not spotted during testing.
[ Checklist ]
[x] *all* changes are documented in the d/changelog
[x] I reviewed all changes and I approve them
[x] attach debdiff against the package in (old)stable
[x] the issue is verified as fixed in unstable
[ Changes ]
+debian-edu-artwork (2.12.3-2~deb12u1) bookworm; urgency=medium
+
+ * Release to bookworm. This provides an Emerald theme based
+ artwork for upcoming Debian Edu 12 release.
+
+ -- Mike Gabriel <sunwea...@debian.org> Sun, 19 Nov 2023 10:11:30 +0100
+
+debian-edu-artwork (2.12.3-2) unstable; urgency=medium
+
+ [ Guido Berhoerster ]
+ * Install separate copies of update-debian-edu-artwork into each
+ artwork variant bin:pkg. (Closes: #1054338).
+
+ -- Mike Gabriel <sunwea...@debian.org> Mon, 30 Oct 2023 14:47:01 +0100
+
+debian-edu-artwork (2.12.3-1) unstable; urgency=medium
+
+ [ Guido Berhoerster ]
+ * Create proper Emerald-based theme
+ * Use single script instead of individual update-debian-edu-artwork-*
scripts.
+
+ [ Mike Gabriel ]
+ * arctica-greeter: Add gsettings override for background and debian-edu'fied
+ logo image.
+ * logo/greeter-debian-edu-logo.*: Add huge versions of the Debian Edu logo
+ used in the greeter.
+ * debian/update-debian-edu-artwork: Stop checking if this is a Debian Edu
+ system.
+
+ -- Mike Gabriel <sunwea...@debian.org> Thu, 05 Oct 2023 20:36:15 +0200
[ Other info ]
Acceptance of this upload to bookworm is +/- critical for the upcoming
Debian Edu release. Thanks.
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-common/arctica-greeter/32_arctica-greeter-theme-debian-edu.gschema.override
debian-edu-artwork-2.12.3/art-common/arctica-greeter/32_arctica-greeter-theme-debian-edu.gschema.override
---
debian-edu-artwork-2.12.2/art-common/arctica-greeter/32_arctica-greeter-theme-debian-edu.gschema.override
1970-01-01 01:00:00.000000000 +0100
+++
debian-edu-artwork-2.12.3/art-common/arctica-greeter/32_arctica-greeter-theme-debian-edu.gschema.override
2023-10-05 20:35:21.000000000 +0200
@@ -0,0 +1,3 @@
+[org.ArcticaProject.arctica-greeter]
+background='/usr/share/desktop-base/active-theme/login/background-nologo.svg'
+logo='/usr/share/arctica-greeter/theme-debian-edu-logo.png'
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/art-common/arctica-greeter/debian-edu-logo-hidpi.png
and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/art-common/arctica-greeter/debian-edu-logo-hidpi.png
differ
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/art-common/arctica-greeter/debian-edu-logo.png
and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/art-common/arctica-greeter/debian-edu-logo.png
differ
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-common/arctica-greeter/Makefile.am
debian-edu-artwork-2.12.3/art-common/arctica-greeter/Makefile.am
--- debian-edu-artwork-2.12.2/art-common/arctica-greeter/Makefile.am
1970-01-01 01:00:00.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-common/arctica-greeter/Makefile.am
2023-10-05 20:35:21.000000000 +0200
@@ -0,0 +1,7 @@
+install-data-local:
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/arctica-greeter
+ $(INSTALL_DATA) debian-edu-logo.png \
+ $(DESTDIR)$(datadir)/arctica-greeter/theme-debian-edu-logo.png
+ $(mkinstalldirs) $(DESTDIR)$(datadir)/glib-2.0/schemas
+ $(INSTALL_DATA) 32_arctica-greeter-theme-debian-edu.gschema.override \
+
$(DESTDIR)$(datadir)/glib-2.0/schemas/32_arctica-greeter-theme-debian-edu.gschema.override
diff -Nru --exclude '*.svg' debian-edu-artwork-2.12.2/art-common/Makefile.am
debian-edu-artwork-2.12.3/art-common/Makefile.am
--- debian-edu-artwork-2.12.2/art-common/Makefile.am 2020-11-25
17:28:19.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-common/Makefile.am 2023-10-05
20:35:21.000000000 +0200
@@ -1,2 +1,3 @@
SUBDIRS = \
- gdm-theme
+ gdm-theme \
+ arctica-greeter
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-emerald/desktop-base/gnome-background.xml
debian-edu-artwork-2.12.3/art-emerald/desktop-base/gnome-background.xml
--- debian-edu-artwork-2.12.2/art-emerald/desktop-base/gnome-background.xml
2023-01-30 20:34:45.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-emerald/desktop-base/gnome-background.xml
1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-<background>
- <static>
- <duration>8640000.0</duration>
- <file>
- <size width="1024"
height="768">/usr/share/desktop-base/debian-edu-emerald-theme/wallpaper/contents/images/1024x768.svg</size>
- <size width="1280"
height="720">/usr/share/desktop-base/debian-edu-emerald-theme/wallpaper/contents/images/1280x720.svg</size>
- <size width="1280"
height="800">/usr/share/desktop-base/debian-edu-emerald-theme/wallpaper/contents/images/1280x800.svg</size>
- <size width="1280"
height="1024">/usr/share/desktop-base/debian-edu-emerald-theme/wallpaper/contents/images/1280x800.svg</size>
- <size width="1600"
height="1200">/usr/share/desktop-base/debian-edu-emerald-theme/wallpaper/contents/images/1600x1024.svg</size>
- <size width="1920"
height="1080">/usr/share/desktop-base/debian-edu-emerald-theme/wallpaper/contents/images/1920x1080.svg</size>
- <size width="1920"
height="1200">/usr/share/desktop-base/debian-edu-emerald-theme/wallpaper/contents/images/1920x1200.svg</size>
- <size width="2560"
height="1080">/usr/share/desktop-base/debian-edu-emerald-theme/wallpaper/contents/images/2560x1080.svg</size>
- <size width="2560"
height="1600">/usr/share/desktop-base/debian-edu-emerald-theme/wallpaper/contents/images/2560x1600.svg</size>
- <size width="4096"
height="2160">/usr/share/desktop-base/debian-edu-emerald-theme/wallpaper/contents/images/4096x2160.svg</size>
- </file>
- </static>
-</background>
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-emerald/desktop-base/gnome-background.xml.in
debian-edu-artwork-2.12.3/art-emerald/desktop-base/gnome-background.xml.in
--- debian-edu-artwork-2.12.2/art-emerald/desktop-base/gnome-background.xml.in
1970-01-01 01:00:00.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-emerald/desktop-base/gnome-background.xml.in
2023-10-05 19:14:31.000000000 +0200
@@ -0,0 +1,8 @@
+<background>
+ <static>
+ <duration>8640000.0</duration>
+ <file>
+<!-- FILES -->
+ </file>
+ </static>
+</background>
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-emerald/desktop-base/Makefile.am
debian-edu-artwork-2.12.3/art-emerald/desktop-base/Makefile.am
--- debian-edu-artwork-2.12.2/art-emerald/desktop-base/Makefile.am
2023-01-30 20:34:45.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-emerald/desktop-base/Makefile.am
2023-10-05 19:14:31.000000000 +0200
@@ -1,7 +1,5 @@
THEME = emerald
WALLPAPERIMG = \
- 1024x768.svg \
- 1280x720.svg \
1280x800.svg \
1280x1024.svg \
1600x1200.svg \
@@ -9,9 +7,10 @@
1920x1200.svg \
2560x1440.svg \
2560x1600.svg \
- 2560x2048.svg \
+ 3200x1800.svg \
+ 3200x2000.svg \
3840x2160.svg \
- 4096x2160.svg
+ 5120x2880.svg
LOGINIMG = \
background.svg \
@@ -22,7 +21,7 @@
grub-16x9.png
wallpaperdir = $(datadir)/desktop-base/debian-edu-$(THEME)-theme/wallpaper/
-wallpaper_DATA = gnome-background.xml metadata.desktop
+wallpaper_DATA = gnome-background.xml metadata.json
wallpaperimgdir =
$(datadir)/desktop-base/debian-edu-$(THEME)-theme/wallpaper/contents/images/
wallpaperimg_DATA = $(WALLPAPERIMG)
@@ -33,6 +32,18 @@
grubimgdir = $(datadir)/desktop-base/debian-edu-$(THEME)-theme/grub/
grubimg_DATA = $(GRUBIMG) grub_background.sh
+gnome-background.xml: gnome-background.xml.in
+ $(SED) '1,/^<!-- FILES -->$$/ d' $< >$@
+ for img in $(WALLPAPERIMG); do \
+ w="$${img%x*}"; \
+ case $$w in [0-9]*) ;; *) continue ;; esac; \
+ h="$${img#*x}"; h="$${h%.*}"; \
+ case $$h in [0-9]*) ;; *) continue ;; esac; \
+ printf '<size width="%d" height="%d">%s/%s</size>\n' \
+ "$${w}" "$${h}" "$(wallpaperimgdir)" "$$(basename "$${img}")"; \
+ done >>$@
+ $(SED) -e '/^<!-- FILES -->$$/ q' -e p $< >>$@
+
# Build rules for PNG files using the SVG files as source.
grub-4x3.png: grub-4x3.svg
inkscape --export-filename=$@ $^
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-emerald/desktop-base/metadata.desktop
debian-edu-artwork-2.12.3/art-emerald/desktop-base/metadata.desktop
--- debian-edu-artwork-2.12.2/art-emerald/desktop-base/metadata.desktop
2023-01-30 20:34:34.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-emerald/desktop-base/metadata.desktop
1970-01-01 01:00:00.000000000 +0100
@@ -1,7 +0,0 @@
-[Desktop Entry]
-Name=Debian-Edu-Emerald
-
-X-KDE-PluginInfo-Name=Debian Edu Emerald
-X-KDE-PluginInfo-Author=Wolfgang Schweer <wschw...@arcor.de>
-X-KDE-PluginInfo-Email=debian-...@lists.debian.org
-X-KDE-PluginInfo-License=GPLv2+
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-emerald/desktop-base/metadata.json
debian-edu-artwork-2.12.3/art-emerald/desktop-base/metadata.json
--- debian-edu-artwork-2.12.2/art-emerald/desktop-base/metadata.json
1970-01-01 01:00:00.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-emerald/desktop-base/metadata.json
2023-10-05 19:14:31.000000000 +0200
@@ -0,0 +1,13 @@
+{
+ "KPlugin": {
+ "Name": "DebianEdu Emerald",
+ "Id": "DebianEdu-Emerald",
+ "License": "GPLv2+",
+ "Authors": [
+ {
+ "Name": "Juliet Taka",
+ "Email": "juliettetaka.be...@gmail.com"
+ }
+ ]
+ }
+}
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-emerald/g-i/debian-edu-emerald-installer-logo.info
debian-edu-artwork-2.12.3/art-emerald/g-i/debian-edu-emerald-installer-logo.info
---
debian-edu-artwork-2.12.2/art-emerald/g-i/debian-edu-emerald-installer-logo.info
2023-01-30 20:34:45.000000000 +0100
+++
debian-edu-artwork-2.12.3/art-emerald/g-i/debian-edu-emerald-installer-logo.info
2023-10-05 19:14:31.000000000 +0200
@@ -1,5 +1,5 @@
The debian-edu-emerald-installer-logo.svg was created by
-Wolfgang Schweer <wschw...@arcor.de> based upon the Debian 11 Bullseye
+Guido Berhoerster <guido+freiesoftw...@berhoerster.name based upon the Debian
12 Bookworm
Emerald theme by Juliette Taka <taka.julie...@gmail.com> and the Debian Edu
logo by Christoph Muetze <gi...@pixelz.de>.
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-emerald/plymouth/debian-edu-emerald.plymouth
debian-edu-artwork-2.12.3/art-emerald/plymouth/debian-edu-emerald.plymouth
--- debian-edu-artwork-2.12.2/art-emerald/plymouth/debian-edu-emerald.plymouth
2023-01-30 20:34:45.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-emerald/plymouth/debian-edu-emerald.plymouth
2023-10-05 19:14:31.000000000 +0200
@@ -1,6 +1,6 @@
[Plymouth Theme]
-Name=Default theme for Debian Edu 11 Bullseye
-Description=A theme that features 'Emerald' by Juliette Taka and the Debian
Edu logo on a blue background
+Name=Default theme for DebianEdu 12.0 Bookworm
+Description=An Emerald theme by Juliette Taka
ModuleName=script
[script]
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-emerald/plymouth/debian-edu-emerald.script
debian-edu-artwork-2.12.3/art-emerald/plymouth/debian-edu-emerald.script
--- debian-edu-artwork-2.12.2/art-emerald/plymouth/debian-edu-emerald.script
2020-12-01 17:41:18.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-emerald/plymouth/debian-edu-emerald.script
2023-10-05 19:14:31.000000000 +0200
@@ -1,41 +1,40 @@
-# futureprototype.script - boot splash using script plugin
-#
+# emerald.script - boot splash using script plugin
+#
# Copyright (C) 2009 Canonical Ltd.
-#
+# Copyright © 2010-2021 Aurélien Couderc <couc...@debian.org>
+# Copyright © 2014-2022 Juliette Taka <juliette.be...@logilab.fr>
+#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
# 02111-1307, USA.
-#
+#
# Written by: Alberto Milone <alberto.mil...@canonical.com>
#
# Based on the example provided with the "script plugin" written by:
# Charlie Brej <cb...@cs.man.ac.uk>
#
-# Soft Waves theme scripting by Juliette Taka BELIN and Aurélien COUDERC
-# futureprototype by Alex Makas based on Soft Waves, only graphics
modification really
#------------------------------- Constants
-----------------------------------------
-NB_ROTATION_STEPS = 70;
-NB_REFRESHS_BETWEEN_ANIMS = 3;
+NB_ANIM_STEPS = 60;
+NB_REFRESHS_BETWEEN_ANIMS = 2;
# Initial position of the center of the logo in % of background
-DEBIAN_POS_PCT.y = 0.65; # Debian image position in % of screen height
-DEBIAN_HEIGHT_PCT = 0.07; # Debian image height in % of smallest screen
dimension
LOGO_CENTER_PCT.x = 0.5; # Debian swirl image position in % of screen height &
width
-LOGO_CENTER_PCT.y = 0.442;
-LOGO_SIZE_PCT = 0.18; # Debian swirl image size in % of smallest screen
dimension
+LOGO_CENTER_PCT.y = 0.55;
+LOGO_SIZE_PCT = 0.48; # Debian + emerald image size in % of smallest screen
dimension
+LOGO_GLOW_SIZE_PCT = 0.8; # Debian swirl image size in % of smallest screen
dimension
#------------------------------- Globals
-------------------------------------------
# are we currently prompting for a password?
@@ -114,12 +113,14 @@
local.text_height;
local.min_height;
- # Put the 1st line below the logo + some spacing
- y = debian_sprite.GetY() + debian.GetHeight();
+ # Put the 1st line below the logo + some spacing
+ # TODO position from lower edge
+ y = logo_sprite.GetY() + logo.GetHeight();
#Debug("y = " + y);
text_height = first_line_height * 7.5;
- min_height = Window.GetHeight();
+ # subtract Window.GetY() to show info also at smallest of dual srceens
+ min_height = window_max.height - 2 * first_line_height - Window.GetY();
#Debug("text_height=" + text_height + "; min_height=" + min_height);
if (y + text_height > min_height)
@@ -131,68 +132,46 @@
#----------------------------- Screen/window setup ---------------------------
# Compute screen/image ratio and scale the background accordingly
-window_max.width = Window.GetX() * 2 + Window.GetWidth();
-window_max.height = Window.GetY() * 2 + Window.GetHeight();
+window_max.width = Window.GetWidth();
+window_max.height = Window.GetHeight();
screen_ratio = window_max.width / window_max.height;
small_dimension = Math.Min(window_max.width, window_max.height);
#Debug("Window.GetX():" + Window.GetX() + ", Window.GetY():" + Window.GetY());
#Debug("Window is [" + window_max.width + ";" + window_max.height + "],
ratio=" + screen_ratio);
-debian_height = small_dimension * DEBIAN_HEIGHT_PCT;
-debian_pos.y = window_max.height * DEBIAN_POS_PCT.y - debian_height/2;
logo_size = small_dimension * LOGO_SIZE_PCT;
logo_center.x = window_max.width * LOGO_CENTER_PCT.x;
logo_center.y = window_max.height * LOGO_CENTER_PCT.y;
#Debug("Logo center at [" + logo_center.x + ";" + logo_center.y + "], size=" +
logo_size + "px");
-logo_pos.x = logo_center.x - logo_size/2;
+logo_pos.x = logo_center.x - 0.343 * logo_size; # Center the Debian 12 text,
not the image
logo_pos.y = logo_center.y - logo_size/2;
-#------------------------------- Background
----------------------------------------
-bg_image = Image("background.png");
-bg_image_ratio = bg_image.GetWidth() / bg_image.GetHeight();
-if (screen_ratio > bg_image_ratio)
- bg_scale_factor = window_max.width / bg_image.GetWidth();
-else
- bg_scale_factor = window_max.height / bg_image.GetHeight();
-scaled_bg_image = bg_image.Scale(bg_image.GetWidth() * bg_scale_factor,
- bg_image.GetHeight() * bg_scale_factor);
-
-# Display background
-bg_sprite = Sprite(scaled_bg_image);
-bg_sprite.SetPosition(Window.GetX() + Window.GetWidth() / 2 -
scaled_bg_image.GetWidth() / 2,
- Window.GetY() + Window.GetHeight() / 2 -
scaled_bg_image.GetHeight() / 2,
- -1000);
-
-#------------------------------- Debian
----------------------------------------------
-debian = Image("debian-edu-logo.png");
-# Target same height as logo
-debian_scale_factor = debian_height / debian.GetHeight();
-debian = debian.Scale(debian.GetWidth() * debian_scale_factor,
- debian.GetHeight() * debian_scale_factor);
-debian_sprite = Sprite(debian);
-debian_sprite.SetPosition(window_max.width / 2 - debian.GetWidth() / 2,
- debian_pos.y,
- -90);
+logo_glow_size = small_dimension * LOGO_GLOW_SIZE_PCT;
+
-#------------------------------- Logo
----------------------------------------------
-logo = Image("logo.png");
+#---------------------------- Logo + Emerald ---------------------------------
+logo = Image("logo+emerald.png");
logo_scale_factor = logo_size / logo.GetWidth();
logo = logo.Scale(logo.GetWidth() * logo_scale_factor,
logo.GetHeight() * logo_scale_factor);
logo_to_top_edge = Window.GetHeight() * 0.3;
logo_sprite = Sprite(logo);
-logo_sprite.SetPosition(logo_pos.x, logo_pos.y, -50);
-
+logo_sprite.SetPosition(logo_pos.x, logo_pos.y, -1);
+#logo_sprite.SetOpacity(0);
-logo_glow = Image("logo_circle.png");
-logo_glow_scale_factor = logo_size / logo_glow.GetWidth();
-logo_glow[0] = logo_glow.Scale(logo_glow.GetWidth() * logo_glow_scale_factor,
+logo_glow = Image("glow.png");
+logo_glow_scale_factor = logo_glow_size / logo_glow.GetWidth();
+logo_glow = logo_glow.Scale(logo_glow.GetWidth() * logo_glow_scale_factor,
logo_glow.GetHeight() * logo_glow_scale_factor);
-logo_glow_sprite = Sprite();
-logo_glow_sprite.SetPosition(logo_pos.x, logo_pos.y, -60);
-logo_glow_sprite.SetImage(logo_glow[0]);
+logo_glow_pos.x = logo_center.x - logo_glow.GetWidth() / 2;
+# Place glow vertically between the Debian 12 text and the emerald
+logo_glow_pos.y = logo_pos.y + logo.GetHeight()*0.1 - logo_glow.GetHeight() /
2;
+
+logo_glow_sprite = Sprite();
+logo_glow_sprite.SetPosition(logo_glow_pos.x, logo_glow_pos.y, -2);
+logo_glow_sprite.SetImage(logo_glow);
#------------------------------String functions-------------------------------
@@ -254,12 +233,12 @@
#-----------------------------------------------------------------------------
# Top background colour
-# #489291 --> 0.282, 0.572, 0.569
-# New background colour
-# #0a3649 --> 0.039, 0.212, 0.286
+# #05475c --> 0.0196, 0.2784, 0.3608
+# Bottom background colour
+# #05475c --> 0.0196, 0.2784, 0.3608
#
-Window.SetBackgroundTopColor (0.282, 0.572, 0.569); # Nice colour on top
of the screen fading to
-Window.SetBackgroundBottomColor (0.039, 0.212, 0.286); # an equally nice
colour on the bottom
+Window.SetBackgroundTopColor (0.02, 0.279, 0.3608); # Nice colour on top
of the screen fading to
+Window.SetBackgroundBottomColor (0.02, 0.279, 0.3608); # an equally nice
colour on the bottom
bits_per_pixel = Window.GetBitsPerPixel ();
# TODO need to handle 16 colors ?
@@ -552,7 +531,7 @@
}
}
-Plymouth.SetDisplayPasswordFunction (display_password_callback);
+Plymouth.SetDisplayPasswordFunction (display_password_callback);
Plymouth.SetMessageFunction (message_callback);
@@ -653,7 +632,7 @@
return 0;
}
- }
+ }
# Update progress label here
#
# FIXME: the queue logic from this theme should really be moved into
mountall
@@ -687,7 +666,7 @@
global.fsck_queue[0].device;
global.fsck_queue[0].progress;
global.fsck_queue.counter = 0;
- global.fsck_queue.biggest_item = 0;
+ global.fsck_queue.biggest_item = 0;
}
fun clear_queue () {
@@ -966,7 +945,7 @@
}
}
-Plymouth.SetUpdateStatusFunction (update_status_callback);
+Plymouth.SetUpdateStatusFunction (update_status_callback);
#-----------------------------------------Display Question stuff
-----------------------
#
@@ -979,7 +958,7 @@
# time++;
#}
#
-#Plymouth.SetDisplayQuestionFunction (display_question_callback);
+#Plymouth.SetDisplayQuestionFunction (display_question_callback);
fun rotate_img(source_img, current_step, nb_steps) {
angle = Math.Sin(current_step / nb_steps * Math.Pi / 2) * 2 * Math.Pi;
@@ -990,24 +969,30 @@
}
fun update_glow_anim () {
+ if (global.anim_iter > NB_ANIM_STEPS) {
+ global.anim_iter = 0;
+ }
+ #DebugMedium("iter = " + global.anim_iter);
+ glow_opacity = 0.7 + 0.3 * Math.Cos(global.anim_iter / NB_ANIM_STEPS * 2 *
Math.Pi);
+ #Debug("glow_opacity = " + glow_opacity);
if (global.anim_start_time != global.progress_time && global.anim_status
!= "running") {
- gloabl.anim_start_time = global.progress_time;
+ global.anim_start_time = global.progress_time;
global.anim_iter = 0;
global.anim_status = "running";
}
if (global.anim_status == "running") {
- iter_img = global.logo_glow[global.anim_iter];
- if (iter_img == NULL) {
- # Generate rotated image for the glow around the logo on demand.
- #DebugMedium("Generating rotated image for index " +
global.anim_iter);
- iter_img = rotate_img(logo_glow[0], global.anim_iter,
NB_ROTATION_STEPS);
- global.logo_glow[global.anim_iter] = iter_img;
- }
- global.logo_glow_sprite.SetImage(iter_img);
+# iter_img = global.logo_glow[global.anim_iter];
+# if (iter_img == NULL) {
+# # Generate rotated image for the glow around the logo on demand.
+# #DebugMedium("Generating rotated image for index " +
global.anim_iter);
+# #iter_img = rotate_img(logo_glow[0], global.anim_iter,
NB_ANIM_STEPS);
+# global.logo_glow[global.anim_iter] = iter_img;
+# }
+ global.logo_glow_sprite.SetOpacity(glow_opacity);
global.anim_iter++;
- if (global.anim_iter >= NB_ROTATION_STEPS) {
+ if (global.anim_iter >= NB_ANIM_STEPS) {
global.anim_status = "stopped";
}
}
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/art-emerald/plymouth/debian.png and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/art-emerald/plymouth/debian.png differ
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/art-emerald/plymouth/glow.png and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/art-emerald/plymouth/glow.png differ
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/art-emerald/plymouth/glow.xcf and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/art-emerald/plymouth/glow.xcf differ
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/art-emerald/plymouth/logo_circle.png
and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/art-emerald/plymouth/logo_circle.png
differ
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/art-emerald/plymouth/logo+emerald.png
and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/art-emerald/plymouth/logo+emerald.png
differ
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-emerald/plymouth/Makefile.am
debian-edu-artwork-2.12.3/art-emerald/plymouth/Makefile.am
--- debian-edu-artwork-2.12.2/art-emerald/plymouth/Makefile.am 2023-01-30
20:34:45.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-emerald/plymouth/Makefile.am 2023-10-05
19:14:31.000000000 +0200
@@ -1,10 +1,11 @@
THEME = emerald
plymouthdir = $(datadir)/plymouth/themes/debian-edu-$(THEME)
plymouth_DATA = \
- background.png \
- debian-edu-logo.png \
- logo.png \
- logo_circle.png \
+ debian.png \
+ Emerald_plymouth.svg \
+ glow.png \
+ logo+emerald.png \
+ logo+emerald.svg \
password_dot16.png \
password_dot.png \
password_field16.png \
@@ -12,18 +13,8 @@
debian-edu-$(THEME).plymouth \
debian-edu-$(THEME).script
-background.png: debian-edu-$(THEME)-plymouth.svg
- inkscape --export-filename=$@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-debian-edu-logo.png: debian-edu-$(THEME)-logo.svg
- inkscape --export-filename=$@ $^
- optipng -o4 -i0 -fix $@
- advpng -z4 $@
-
-logo.png: logo.svg
- inkscape --export-filename=$@ $^
+logo+emerald.png: logo+emerald.svg
+ inkscape --export-filename=$@ -w 1689 -h 1800 $^
optipng -o4 -i0 -fix $@
advpng -z4 $@
@@ -32,4 +23,4 @@
EXTRA_DIST = $(plymouth_DATA)
-CLEANFILES = background.png debian-edu-logo.png logo.png
+CLEANFILES = logo+emerald.png
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/art-emerald/plymouth/password_dot.png
and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/art-emerald/plymouth/password_dot.png
differ
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/art-emerald/plymouth/password_field.png
and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/art-emerald/plymouth/password_field.png
differ
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/art-emerald/plymouth/README
debian-edu-artwork-2.12.3/art-emerald/plymouth/README
--- debian-edu-artwork-2.12.2/art-emerald/plymouth/README 2020-12-01
17:41:18.000000000 +0100
+++ debian-edu-artwork-2.12.3/art-emerald/plymouth/README 1970-01-01
01:00:00.000000000 +0100
@@ -1 +0,0 @@
-The password* and logo_circle PNG files are taken from the stock Debian theme.
diff -Nru --exclude '*.svg' debian-edu-artwork-2.12.2/configure.ac
debian-edu-artwork-2.12.3/configure.ac
--- debian-edu-artwork-2.12.2/configure.ac 2023-01-30 20:29:56.000000000
+0100
+++ debian-edu-artwork-2.12.3/configure.ac 2023-10-05 20:35:21.000000000
+0200
@@ -22,11 +22,13 @@
AC_PROG_CC
AC_PROG_INSTALL
+AC_PROG_SED
AC_OUTPUT([
Makefile
art-common/Makefile
art-common/gdm-theme/Makefile
+art-common/arctica-greeter/Makefile
art-softwaves/Makefile
art-softwaves/g-i/Makefile
art-softwaves/gnome-shell/Makefile
diff -Nru --exclude '*.svg' debian-edu-artwork-2.12.2/debian/changelog
debian-edu-artwork-2.12.3/debian/changelog
--- debian-edu-artwork-2.12.2/debian/changelog 2023-02-02 17:21:42.000000000
+0100
+++ debian-edu-artwork-2.12.3/debian/changelog 2023-11-19 10:11:30.000000000
+0100
@@ -1,3 +1,34 @@
+debian-edu-artwork (2.12.3-2~deb12u1) bookworm; urgency=medium
+
+ * Release to bookworm. This provides an Emerald theme based
+ artwork for upcoming Debian Edu 12 release.
+
+ -- Mike Gabriel <sunwea...@debian.org> Sun, 19 Nov 2023 10:11:30 +0100
+
+debian-edu-artwork (2.12.3-2) unstable; urgency=medium
+
+ [ Guido Berhoerster ]
+ * Install separate copies of update-debian-edu-artwork into each
+ artwork variant bin:pkg. (Closes: #1054338).
+
+ -- Mike Gabriel <sunwea...@debian.org> Mon, 30 Oct 2023 14:47:01 +0100
+
+debian-edu-artwork (2.12.3-1) unstable; urgency=medium
+
+ [ Guido Berhoerster ]
+ * Create proper Emerald-based theme
+ * Use single script instead of individual update-debian-edu-artwork-*
scripts.
+
+ [ Mike Gabriel ]
+ * arctica-greeter: Add gsettings override for background and debian-edu'fied
+ logo image.
+ * logo/greeter-debian-edu-logo.*: Add huge versions of the Debian Edu logo
+ used in the greeter.
+ * debian/update-debian-edu-artwork: Stop checking if this is a Debian Edu
+ system.
+
+ -- Mike Gabriel <sunwea...@debian.org> Thu, 05 Oct 2023 20:36:15 +0200
+
debian-edu-artwork (2.12.2-2) unstable; urgency=medium
* Source only upload for testing migration.
diff -Nru --exclude '*.svg' debian-edu-artwork-2.12.2/debian/control
debian-edu-artwork-2.12.3/debian/control
--- debian-edu-artwork-2.12.2/debian/control 2023-01-30 21:18:57.000000000
+0100
+++ debian-edu-artwork-2.12.3/debian/control 2023-10-30 14:46:33.000000000
+0100
@@ -5,10 +5,10 @@
Uploaders: Petter Reinholdtsen <p...@debian.org>,
Holger Levsen <hol...@debian.org>,
Mike Gabriel <sunwea...@debian.org>,
- Wolfgang Schweer <wschw...@arcor.de>,
Build-Depends: advancecomp,
debhelper-compat (= 13),
devscripts,
+ dh-exec,
fonts-quicksand,
imagemagick,
inkscape,
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/debian/debian-edu-artwork-buster.install
debian-edu-artwork-2.12.3/debian/debian-edu-artwork-buster.install
--- debian-edu-artwork-2.12.2/debian/debian-edu-artwork-buster.install
2020-01-23 21:54:53.000000000 +0100
+++ debian-edu-artwork-2.12.3/debian/debian-edu-artwork-buster.install
2023-10-30 14:46:33.000000000 +0100
@@ -1,5 +1,6 @@
-debian/update-debian-edu-artwork-buster /usr/sbin/
+#!/usr/bin/dh-exec
usr/share/desktop-base/debian-edu-buster-theme/
usr/share/gnome-background-properties/debian-edu-buster.xml
usr/share/pixmaps/debian-edu-buster*
usr/share/plymouth/themes/debian-edu-buster/
+debian/update-debian-edu-artwork => /usr/sbin/update-debian-edu-artwork-buster
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/debian/debian-edu-artwork-emerald.install
debian-edu-artwork-2.12.3/debian/debian-edu-artwork-emerald.install
--- debian-edu-artwork-2.12.2/debian/debian-edu-artwork-emerald.install
2023-01-30 20:36:07.000000000 +0100
+++ debian-edu-artwork-2.12.3/debian/debian-edu-artwork-emerald.install
2023-10-30 14:46:33.000000000 +0100
@@ -1,5 +1,6 @@
-debian/update-debian-edu-artwork-emerald /usr/sbin/
+#!/usr/bin/dh-exec
usr/share/desktop-base/debian-edu-emerald-theme/
usr/share/gnome-background-properties/debian-edu-emerald.xml
usr/share/pixmaps/debian-edu-emerald*
usr/share/plymouth/themes/debian-edu-emerald/
+debian/update-debian-edu-artwork => /usr/sbin/update-debian-edu-artwork-emerald
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/debian/debian-edu-artwork-homeworld.install
debian-edu-artwork-2.12.3/debian/debian-edu-artwork-homeworld.install
--- debian-edu-artwork-2.12.2/debian/debian-edu-artwork-homeworld.install
2020-12-01 17:41:18.000000000 +0100
+++ debian-edu-artwork-2.12.3/debian/debian-edu-artwork-homeworld.install
2023-10-30 14:46:33.000000000 +0100
@@ -1,5 +1,6 @@
-debian/update-debian-edu-artwork-homeworld /usr/sbin/
+#!/usr/bin/dh-exec
usr/share/desktop-base/debian-edu-homeworld-theme/
usr/share/gnome-background-properties/debian-edu-homeworld.xml
usr/share/pixmaps/debian-edu-homeworld*
usr/share/plymouth/themes/debian-edu-homeworld/
+debian/update-debian-edu-artwork =>
/usr/sbin/update-debian-edu-artwork-homeworld
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/debian/debian-edu-artwork.install
debian-edu-artwork-2.12.3/debian/debian-edu-artwork.install
--- debian-edu-artwork-2.12.2/debian/debian-edu-artwork.install 2020-11-25
17:28:19.000000000 +0100
+++ debian-edu-artwork-2.12.3/debian/debian-edu-artwork.install 2023-10-30
14:46:33.000000000 +0100
@@ -1,2 +1,4 @@
usr/share/gdm/dconf/
usr/share/pixmaps/debian-edu-logo.svg
+usr/share/arctica-greeter/theme-debian-edu-logo.png
+usr/share/glib-2.0/schemas/32_arctica-greeter-theme-debian-edu.gschema.override
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/debian/debian-edu-artwork-softwaves.install
debian-edu-artwork-2.12.3/debian/debian-edu-artwork-softwaves.install
--- debian-edu-artwork-2.12.2/debian/debian-edu-artwork-softwaves.install
2020-01-23 21:54:53.000000000 +0100
+++ debian-edu-artwork-2.12.3/debian/debian-edu-artwork-softwaves.install
2023-10-30 14:46:33.000000000 +0100
@@ -1,5 +1,6 @@
-debian/update-debian-edu-artwork-softwaves /usr/sbin/
+#!/usr/bin/dh-exec
usr/share/desktop-base/debian-edu-softwaves-theme/
usr/share/gnome-background-properties/debian-edu-softwaves.xml
usr/share/pixmaps/debian-edu-softwaves*
usr/share/plymouth/themes/debian-edu-softwaves/
+debian/update-debian-edu-artwork =>
/usr/sbin/update-debian-edu-artwork-softwaves
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/debian/update-debian-edu-artwork
debian-edu-artwork-2.12.3/debian/update-debian-edu-artwork
--- debian-edu-artwork-2.12.2/debian/update-debian-edu-artwork 1970-01-01
01:00:00.000000000 +0100
+++ debian-edu-artwork-2.12.3/debian/update-debian-edu-artwork 2023-10-05
20:35:21.000000000 +0200
@@ -0,0 +1,150 @@
+#! /bin/sh
+set -e
+
+THEMES="buster emerald homeworld softwaves"
+
+edutheme="$(basename "$0")"
+edutheme="${edutheme#update-debian-edu-artwork-}"
+
+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
+}
+
+## GRUB and PXE boot background
+change_grub_background() {
+ 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 command -v update-grub > /dev/null ; then
+ sync
+ update-grub || true
+ fi
+}
+
+restore_grub_background() {
+ 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 command -v 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/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg 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 \
+
"/usr/share/desktop-base/debian-edu-${edutheme}-theme/wallpaper/contents/images/"[0-9]*x*.svg;
+ do
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-background \
+ desktop-background \
+ "${wallpaper}" 50
+ done
+}
+
+restore_desktop_background() {
+ update-alternatives --remove \
+ desktop-background \
+
/usr/share/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg
+ update-alternatives --remove \
+ desktop-background.xml \
+
/usr/share/desktop-base/debian-edu-${edutheme}-theme/wallpaper/gnome-background.xml
+
+ for wallpaper in \
+
"/usr/share/desktop-base/debian-edu-${edutheme}-theme/wallpaper/contents/images/"[0-9]*x*.svg;
+ do
+ update-alternatives --remove \
+ desktop-background \
+ "${wallpaper}"
+ done
+}
+
+## Plymouth
+set_plymouth_theme() {
+ if [ -f /etc/plymouth/plymouthd.conf ] && command -v
plymouth-set-default-theme > /dev/null ; then
+ plymouth-set-default-theme -R debian-edu-${edutheme} || true
+ fi
+}
+
+restore_plymouth_theme() {
+ if [ -f /etc/plymouth/plymouthd.conf ] && command -v
plymouth-set-default-theme > /dev/null ; then
+ plymouth-set-default-theme -R -r || true
+ fi
+}
+
+## Lockscreen
+set_lockscreen() {
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-lockscreen.xml \
+ desktop-lockscreen.xml \
+
/usr/share/desktop-base/debian-edu-${edutheme}-theme/lockscreen/gnome-background.xml
50
+}
+
+restore_lockscreen() {
+ update-alternatives --remove \
+ desktop-lockscreen.xml \
+
/usr/share/desktop-base/debian-edu-${edutheme}-theme/lockscreen/gnome-background.xml
+}
+
+is_valid=false
+for theme in $THEMES; do
+ if [ "${edutheme}" = "${theme}" ]; then
+ is_valid=true
+ fi
+done
+$is_valid || exit 1
+
+case "$1" in
+ configure)
+ for theme in $THEMES; do
+ [ "${theme}" = "${edutheme}" ] && continue
+ if [ -x "/usr/sbin/update-debian-edu-artwork-${theme}"
]; then
+ "/usr/sbin/update-debian-edu-artwork-${theme}"
remove
+ fi
+ done
+ set_active_theme
+ change_grub_background
+ change_desktop_background
+ set_plymouth_theme
+ set_lockscreen
+ ;;
+ remove)
+ restore_active_theme
+ restore_grub_background
+ restore_desktop_background
+ restore_plymouth_theme
+ restore_lockscreen
+ ;;
+esac
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/debian/update-debian-edu-artwork-buster
debian-edu-artwork-2.12.3/debian/update-debian-edu-artwork-buster
--- debian-edu-artwork-2.12.2/debian/update-debian-edu-artwork-buster
2023-01-30 21:02:25.000000000 +0100
+++ debian-edu-artwork-2.12.3/debian/update-debian-edu-artwork-buster
1970-01-01 01:00:00.000000000 +0100
@@ -1,158 +0,0 @@
-#! /bin/sh
-set -e
-
-EDUTHEME="buster"
-
-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
-}
-
-## GRUB and PXE boot background
-change_grub_background() {
- 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 commans -v update-grub > /dev/null ; then
- sync
- update-grub || true
- fi
-}
-
-restore_grub_background() {
- 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 command -v 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/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg 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.svg \
- 1280x720.svg \
- 1280x800.svg \
- 1280x1024.svg \
- 1600x1200.svg \
- 1920x1080.svg \
- 1920x1200.svg \
- 2560x1080.svg \
- 4096x2160.svg; 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/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg
- update-alternatives --remove \
- desktop-background.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/gnome-background.xml
-
- for WALLPAPER in 1024x768.svg \
- 1280x720.svg \
- 1280x800.svg \
- 1280x1024.svg \
- 1600x1200.svg \
- 1920x1080.svg \
- 1920x1200.svg \
- 2560x1080.svg \
- 4096x2160.svg; do
- update-alternatives --remove \
- desktop-background \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/contents/images/$WALLPAPER
- done
-}
-
-## Plymouth
-set_plymouth_theme() {
- if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] &&
command -v plymouth-set-default-theme > /dev/null ; then
- plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
- fi
-}
-
-restore_plymouth_theme() {
- if [ -f /etc/plymouth/plymouthd.conf ] && command -v
plymouth-set-default-theme > /dev/null ; then
- plymouth-set-default-theme -R -r || true
- fi
-}
-
-## Lockscreen
-set_lockscreen() {
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-lockscreen.xml \
- desktop-lockscreen.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/lockscreen/gnome-background.xml
50
-}
-
-restore_lockscreen() {
- update-alternatives --remove \
- desktop-lockscreen.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/lockscreen/gnome-background.xml
-}
-
-case "$1" in
- configure)
- if [ -x /usr/sbin/update-debian-edu-artwork-emerald ]; then
- update-debian-edu-artwork-emerald remove
- fi
- if [ -x /usr/sbin/update-debian-edu-artwork-homeworld ]; then
- update-debian-edu-artwork-homeworld remove
- fi
- if [ -x /usr/sbin/update-debian-edu-artwork-softwaves ]; then
- update-debian-edu-artwork-softwaves remove
- fi
- # honour themes shipped in src:pkg debian-edu-artwork-legacy
- if [ -x /usr/sbin/update-debian-edu-artwork-spacefun ]; then
- update-debian-edu-artwork-spacefun remove
- fi
- set_active_theme
- change_grub_background
- change_desktop_background
- set_plymouth_theme
- set_lockscreen
- ;;
- remove)
- restore_active_theme
- restore_grub_background
- restore_desktop_background
- restore_plymouth_theme
- restore_lockscreen
- ;;
-esac
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/debian/update-debian-edu-artwork-emerald
debian-edu-artwork-2.12.3/debian/update-debian-edu-artwork-emerald
--- debian-edu-artwork-2.12.2/debian/update-debian-edu-artwork-emerald
2023-01-30 20:57:05.000000000 +0100
+++ debian-edu-artwork-2.12.3/debian/update-debian-edu-artwork-emerald
1970-01-01 01:00:00.000000000 +0100
@@ -1,164 +0,0 @@
-#! /bin/sh
-set -e
-
-EDUTHEME="emerald"
-
-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
-}
-
-## GRUB and PXE boot background
-change_grub_background() {
- 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 command -v update-grub > /dev/null ; then
- sync
- update-grub || true
- fi
-}
-
-restore_grub_background() {
- 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 command -v 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/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg 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.svg \
- 1280x720.svg \
- 1280x800.svg \
- 1280x1024.svg \
- 1600x1200.svg \
- 1920x1080.svg \
- 1920x1200.svg \
- 2560x1440.svg \
- 2560x1600.svg \
- 2560x2048.svg \
- 3840x2160.svg \
- 4096x2160.svg; 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/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg
- update-alternatives --remove \
- desktop-background.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/gnome-background.xml
-
- for WALLPAPER in 1024x768.svg \
- 1280x720.svg \
- 1280x800.svg \
- 1280x1024.svg \
- 1600x1200.svg \
- 1920x1080.svg \
- 1920x1200.svg \
- 2560x1440.svg \
- 2560x1600.svg \
- 2560x2048.svg \
- 3840x2160.svg \
- 4096x2160.svg; do
- update-alternatives --remove \
- desktop-background \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/contents/images/$WALLPAPER
- done
-}
-
-## Plymouth
-set_plymouth_theme() {
- if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] &&
command -v plymouth-set-default-theme > /dev/null ; then
- plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
- fi
-}
-
-restore_plymouth_theme() {
- if [ -f /etc/plymouth/plymouthd.conf ] && command -v
plymouth-set-default-theme > /dev/null ; then
- plymouth-set-default-theme -R -r || true
- fi
-}
-
-## Lockscreen
-set_lockscreen() {
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-lockscreen.xml \
- desktop-lockscreen.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/lockscreen/gnome-background.xml
50
-}
-
-restore_lockscreen() {
- update-alternatives --remove \
- desktop-lockscreen.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/lockscreen/gnome-background.xml
-}
-
-case "$1" in
- configure)
- if [ -x /usr/sbin/update-debian-edu-artwork-homeworld ]; then
- update-debian-edu-artwork-homeworld remove
- fi
- if [ -x /usr/sbin/update-debian-edu-artwork-buster ]; then
- update-debian-edu-artwork-buster remove
- fi
- if [ -x /usr/sbin/update-debian-edu-artwork-softwaves ]; then
- update-debian-edu-artwork-softwaves remove
- fi
- # honour themes shipped in src:pkg debian-edu-artwork-legacy
- if [ -x /usr/sbin/update-debian-edu-artwork-spacefun ]; then
- update-debian-edu-artwork-spacefun remove
- fi
- set_active_theme
- change_grub_background
- change_desktop_background
- set_plymouth_theme
- set_lockscreen
- ;;
- remove)
- restore_active_theme
- restore_grub_background
- restore_desktop_background
- restore_plymouth_theme
- restore_lockscreen
- ;;
-esac
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/debian/update-debian-edu-artwork-homeworld
debian-edu-artwork-2.12.3/debian/update-debian-edu-artwork-homeworld
--- debian-edu-artwork-2.12.2/debian/update-debian-edu-artwork-homeworld
2023-01-30 21:02:56.000000000 +0100
+++ debian-edu-artwork-2.12.3/debian/update-debian-edu-artwork-homeworld
1970-01-01 01:00:00.000000000 +0100
@@ -1,164 +0,0 @@
-#! /bin/sh
-set -e
-
-EDUTHEME="homeworld"
-
-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
-}
-
-## GRUB and PXE boot background
-change_grub_background() {
- 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 command -v update-grub > /dev/null ; then
- sync
- update-grub || true
- fi
-}
-
-restore_grub_background() {
- 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 command -v 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/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg 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.svg \
- 1280x720.svg \
- 1280x800.svg \
- 1280x1024.svg \
- 1600x1200.svg \
- 1920x1080.svg \
- 1920x1200.svg \
- 2560x1440.svg \
- 2560x1600.svg \
- 2560x2048.svg \
- 3840x2160.svg \
- 4096x2160.svg; 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/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg
- update-alternatives --remove \
- desktop-background.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/gnome-background.xml
-
- for WALLPAPER in 1024x768.svg \
- 1280x720.svg \
- 1280x800.svg \
- 1280x1024.svg \
- 1600x1200.svg \
- 1920x1080.svg \
- 1920x1200.svg \
- 2560x1440.svg \
- 2560x1600.svg \
- 2560x2048.svg \
- 3840x2160.svg \
- 4096x2160.svg; do
- update-alternatives --remove \
- desktop-background \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/contents/images/$WALLPAPER
- done
-}
-
-## Plymouth
-set_plymouth_theme() {
- if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] &&
command -v plymouth-set-default-theme > /dev/null ; then
- plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
- fi
-}
-
-restore_plymouth_theme() {
- if [ -f /etc/plymouth/plymouthd.conf ] && command -v
plymouth-set-default-theme > /dev/null ; then
- plymouth-set-default-theme -R -r || true
- fi
-}
-
-## Lockscreen
-set_lockscreen() {
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-lockscreen.xml \
- desktop-lockscreen.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/lockscreen/gnome-background.xml
50
-}
-
-restore_lockscreen() {
- update-alternatives --remove \
- desktop-lockscreen.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/lockscreen/gnome-background.xml
-}
-
-case "$1" in
- configure)
- if [ -x /usr/sbin/update-debian-edu-artwork-emerald ]; then
- update-debian-edu-artwork-emerald remove
- fi
- if [ -x /usr/sbin/update-debian-edu-artwork-buster ]; then
- update-debian-edu-artwork-buster remove
- fi
- if [ -x /usr/sbin/update-debian-edu-artwork-softwaves ]; then
- update-debian-edu-artwork-softwaves remove
- fi
- # honour themes shipped in src:pkg debian-edu-artwork-legacy
- if [ -x /usr/sbin/update-debian-edu-artwork-spacefun ]; then
- update-debian-edu-artwork-spacefun remove
- fi
- set_active_theme
- change_grub_background
- change_desktop_background
- set_plymouth_theme
- set_lockscreen
- ;;
- remove)
- restore_active_theme
- restore_grub_background
- restore_desktop_background
- restore_plymouth_theme
- restore_lockscreen
- ;;
-esac
diff -Nru --exclude '*.svg'
debian-edu-artwork-2.12.2/debian/update-debian-edu-artwork-softwaves
debian-edu-artwork-2.12.3/debian/update-debian-edu-artwork-softwaves
--- debian-edu-artwork-2.12.2/debian/update-debian-edu-artwork-softwaves
2023-01-30 21:03:52.000000000 +0100
+++ debian-edu-artwork-2.12.3/debian/update-debian-edu-artwork-softwaves
1970-01-01 01:00:00.000000000 +0100
@@ -1,160 +0,0 @@
-#! /bin/sh
-set -e
-
-EDUTHEME="softwaves"
-
-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
-}
-
-## GRUB and PXE boot background
-change_grub_background() {
- 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 command -v update-grub > /dev/null ; then
- sync
- update-grub || true
- fi
-}
-
-restore_grub_background() {
- 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 command -v 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/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg 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.svg \
- 1280x720.svg \
- 1280x800.svg \
- 1280x1024.svg \
- 1600x1200.svg \
- 1920x1080.svg \
- 1920x1200.svg \
- 2560x1080.svg \
- 2560x1440.svg \
- 2560x1600.svg; 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/desktop-base/active-theme/wallpaper/contents/images/1920x1080.svg
- update-alternatives --remove \
- desktop-background.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/gnome-background.xml
-
- for WALLPAPER in 1024x768.svg \
- 1280x720.svg \
- 1280x800.svg \
- 1280x1024.svg \
- 1600x1200.svg \
- 1920x1080.svg \
- 1920x1200.svg \
- 2560x1080.svg \
- 2560x1440.svg \
- 2560x1600.svg; do
- update-alternatives --remove \
- desktop-background \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/wallpaper/contents/images/$WALLPAPER
- done
-}
-
-## Plymouth
-set_plymouth_theme() {
- if [ -f /etc/plymouth/plymouthd.conf ] && [ -f /etc/debian-edu/config ] &&
command -v plymouth-set-default-theme > /dev/null ; then
- plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
- fi
-}
-
-restore_plymouth_theme() {
- if [ -f /etc/plymouth/plymouthd.conf ] && command -v
plymouth-set-default-theme > /dev/null ; then
- plymouth-set-default-theme -R -r || true
- fi
-}
-
-## Lockscreen
-set_lockscreen() {
- update-alternatives --install \
- /usr/share/images/desktop-base/desktop-lockscreen.xml \
- desktop-lockscreen.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/lockscreen/gnome-background.xml
50
-}
-
-restore_lockscreen() {
- update-alternatives --remove \
- desktop-lockscreen.xml \
-
/usr/share/desktop-base/debian-edu-${EDUTHEME}-theme/lockscreen/gnome-background.xml
-}
-
-case "$1" in
- configure)
- if [ -x /usr/sbin/update-debian-edu-artwork-emerald ]; then
- update-debian-edu-artwork-emerald remove
- fi
- if [ -x /usr/sbin/update-debian-edu-artwork-buster ]; then
- update-debian-edu-artwork-buster remove
- fi
- if [ -x /usr/sbin/update-debian-edu-artwork-homeworld ]; then
- update-debian-edu-artwork-homeworld remove
- fi
- # honour themes shipped in src:pkg debian-edu-artwork-legacy
- if [ -x /usr/sbin/update-debian-edu-artwork-spacefun ]; then
- update-debian-edu-artwork-spacefun remove
- fi
- set_active_theme
- change_grub_background
- change_desktop_background
- set_plymouth_theme
- set_lockscreen
- ;;
- remove)
- restore_active_theme
- restore_grub_background
- restore_desktop_background
- restore_plymouth_theme
- restore_lockscreen
- ;;
-esac
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/logo/greeter-debian-edu-logo.png and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/logo/greeter-debian-edu-logo.png
differ
Binary files
/tmp/fVmZ0FEonI/debian-edu-artwork-2.12.2/logo/greeter-debian-edu-logo.xcf and
/tmp/RdxkximxRI/debian-edu-artwork-2.12.3/logo/greeter-debian-edu-logo.xcf
differ
