--- Begin Message ---
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: freeze-exception
Please unblock package desktop-base for letting Squeeze artwork migrate
to testing. The diff is a bit bigger than I would have liked due to the
KDE3-KDE4 transition which had not been anticipated in the package.
I have some more fixes for a future 6.0.3 upload but if the current
version could migrate it'd be nice.
The debdiff from 5.0.6 to 6.0.2 is 3.9M large because of image changes
so I'm not attaching it directly, but rather a filterdiff with images
ignored. I'm attaching the debdiff candidate from 6.0.2 to 6.0.3 too for
information
corsac@hidalgo: svn diff svn+ssh://svn.debian.org/svn/debian-desktop/packages/tags/desktop-base/{5.0.6,6.0.2} |diffstat
Makefile | 80
backgrounds/spacefun-wallpaper-widescreen.svg | 2304 +
backgrounds/spacefun-wallpaper.svg | 2272 +
debian/README.Debian | 39
debian/changelog | 80
debian/control | 2
debian/copyright | 9
debian/postinst | 52
debian/postrm | 12
debian/preinst | 3
debian/prerm | 12
gdm3/10_desktop-base | 2
gdm3/background.svg | 2289 +
grub/grub_background.sh | 3
kdm-theme/kdm.d/10_desktop-base | 4
kdm-theme/moreblue-orbit/background.svg | 516
kdm-theme/spacefun/KdmGreeterTheme.desktop | 8
kdm-theme/spacefun/spacefun.xml | 162
ksplash-theme/spacefun/1600x1200/description.txt | 42
ksplash-theme/spacefun/Theme.rc | 9
plymouth/spacefun/spacefun.plymouth | 8
plymouth/spacefun/spacefun.script | 465
profiles/kde-profile/kdeglobals | 1
profiles/kde-profile/share/config/kdesktoprc | 18
profiles/kde-profile/share/config/ksplashrc | 2
profiles/kde-profile/share/config/plasma-desktop-appletsrc | 2
profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml | 4
source/spacefun/grub.svg | 1999 +
source/spacefun/splash.svg | 2357 +
source/spacefun/splashy.svg |14677 ++++++++++
source/spacefun/wallpaper.svg | 2297 +
splash/spacefun-splash.svg | 2357 +
splashy/spacefun/theme.xml | 137
33 files changed, 31925 insertions(+), 299 deletions(-)
corsac@hidalgo: svn diff svn+ssh://svn.debian.org/svn/debian-desktop/packages/{tags/desktop-base/6.0.2,trunk/desktop-base} |diffstat
debian/changelog | 14 ++++
debian/copyright | 33 +---------
debian/prerm | 3
profiles/kde-profile/kdeglobals | 1
profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml | 1
5 files changed, 21 insertions(+), 31 deletions(-)
unblock desktop-base/6.0.2
Thanks,
--
Yves-Alexis
-- System Information:
Debian Release: squeeze/sid
APT prefers unstable
APT policy: (500, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Kernel: Linux 2.6.32-5-amd64 (SMP w/2 CPU cores)
Locale: LANG=en_US.utf8, LC_CTYPE=en_US.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Index: usplash/moreblue-orbit/progress.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: pixmaps/debian-security.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: plymouth/spacefun/star-white-small.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/star-white-small.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/star-fuzzy.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/star-fuzzy.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/logo.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/spacefun.plymouth
===================================================================
--- plymouth/spacefun/spacefun.plymouth (.../5.0.6) (revision 0)
+++ plymouth/spacefun/spacefun.plymouth (.../6.0.2) (revision 221)
@@ -0,0 +1,8 @@
+[Plymouth Theme]
+Name=Debian Space Fun theme
+Description=This is the default desktop theme for Debian 6.0 (Squeeze)
+ModuleName=script
+
+[script]
+ImageDir=/usr/share/plymouth/themes/spacefun
+ScriptFile=/usr/share/plymouth/themes/spacefun/spacefun.script
Index: plymouth/spacefun/entry.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/entry.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/star-fuzzy-small.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/star-fuzzy-small.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/rocket0.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/rocket0.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/rocket1.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/rocket1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/rocket2.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/rocket2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/rocket3.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/rocket3.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/background.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/star-red.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/star-red.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/swirlaxy.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/swirlaxy.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/earth0.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/earth0.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/planet.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/planet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/earth1.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/earth1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/spacefun.script
===================================================================
--- plymouth/spacefun/spacefun.script (.../5.0.6) (revision 0)
+++ plymouth/spacefun/spacefun.script (.../6.0.2) (revision 221)
@@ -0,0 +1,465 @@
+# Spacefun Plymouth theme script
+# Copyright 2010 Aurélien COUDERC
+#
+# Inspired by the great blog series on Plymouth by Charlie Brej.
+#
+# The script uses the material made by Valessio Brito for his SpaceFun
+# theme for Debian 6.0 Squeeze.
+
+# 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 3 of the License, 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, see <http://www.gnu.org/licenses/>.
+
+#------------------------------- Constants -----------------------------------------
+NUM_STARS = 40;
+MAX_STAR_SIZE = Math.Min(Window.GetWidth(), Window.GetHeight()) * 0.045;
+MAX_MSG_DISPLAYED = 5;
+
+#------------------------------- Background ----------------------------------------
+bg_image = Image("background.png");
+
+# Compute screen/image ratio and scale the background accordingly
+screen_ratio = Window.GetWidth() / Window.GetHeight();
+bg_image_ratio = bg_image.GetWidth() / bg_image.GetHeight();
+if (screen_ratio > bg_image_ratio)
+ bg_scale_factor = Window.GetWidth() / bg_image.GetWidth();
+else
+ bg_scale_factor = Window.GetHeight() / 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.GetWidth() / 2 - scaled_bg_image.GetWidth() / 2,
+ Window.GetHeight() / 2 - scaled_bg_image.GetHeight() / 2,
+ -10000);
+
+#------------------------------- Earth ---------------------------------------------
+earth_height = Math.Min(Window.GetWidth(), Window.GetHeight()) * 0.12;
+for (i = 0; i < 5; i++)
+ {
+ earth_image = Image("earth" + i + ".png");
+ earth_scale_factor = earth_height / earth_image.GetHeight();
+ earth_images[i] = earth_image.Scale(earth_image.GetWidth() * earth_scale_factor,
+ earth_image.GetHeight() * earth_scale_factor);
+ }
+
+earth_glow_index = 0;
+earth_sprite = Sprite(earth_images[earth_glow_index]);
+earth_to_edge = Math.Min(Window.GetWidth(), Window.GetHeight()) * 0.07;
+earth_x = earth_to_edge;
+earth_y = Window.GetHeight() - earth_to_edge - earth_images[0].GetHeight();
+earth_sprite.SetPosition(earth_x, earth_y, -10);
+
+#------------------------------- Planet --------------------------------------------
+planet_image = Image("planet.png");
+planet_height = Math.Min(Window.GetWidth(), Window.GetHeight()) * 0.07;
+planet_scale_factor = planet_height / planet_image.GetHeight();
+planet_image = planet_image.Scale(planet_image.GetWidth() * planet_scale_factor,
+ planet_image.GetHeight() * planet_scale_factor);
+planet_sprite = Sprite(planet_image);
+planet_to_edge_y = Window.GetHeight() * 0.14;
+planet_to_edge_x = Window.GetWidth() * 0.08;
+planet_x = Window.GetWidth() - planet_to_edge_x - planet_image.GetWidth();
+planet_y = planet_to_edge_y;
+planet_sprite.SetPosition(planet_x, planet_y, -10);
+
+#------------------------------- Logo ----------------------------------------------
+logo_image = Image("logo.png");
+logo_height = Math.Min(Window.GetWidth(), Window.GetHeight()) * 0.095;
+logo_scale_factor = logo_height / logo_image.GetHeight();
+logo_image = logo_image.Scale(logo_image.GetWidth() * logo_scale_factor,
+ logo_image.GetHeight() * logo_scale_factor);
+logo_sprite = Sprite(logo_image);
+logo_to_edge = Window.GetHeight() * 0.1;
+logo_sprite.SetPosition(Window.GetWidth() - logo_to_edge - logo_image.GetWidth(),
+ Window.GetHeight() - logo_to_edge - logo_image.GetHeight(),
+ -10);
+
+#------------------------------- Swirl galaxies ------------------------------------
+swirlaxy_image = Image("swirlaxy.png");
+if (!(Plymouth.GetMode() == "boot" || Plymouth.GetMode == "resume"))
+ {
+ swirls[0].x = 0.1; # Percentage of screen from left when positive, or right otherwise
+ swirls[0].y = 0.1; # Percentage of screen from top when positive, or bottom otherwise
+ swirls[0].height_p = 0.21; # Percent of screen height
+ swirls[0].angle = Math.Pi;
+ swirls[1].x = 0.54;
+ swirls[1].y = 0.14;
+ swirls[1].height_p = 0.11;
+ swirls[1].angle = Math.Pi;
+ swirls[2].x = -0.16;
+ swirls[2].y = -0.16;
+ swirls[2].height_p = 0.31;
+ swirls[2].angle = 0;
+ }
+else
+ {
+ swirls[0].x = 0.1;
+ swirls[0].y = 0.12;
+ swirls[0].height_p = 0.38;
+ swirls[0].angle = 0;
+ swirls[1].x = 0.3;
+ swirls[1].y = -0.24;
+ swirls[1].height_p = 0.065;
+ swirls[1].angle = Math.Pi;
+ swirls[2].x = -0.05;
+ swirls[2].y = -0.3;
+ swirls[2].height_p = 0.21;
+ swirls[2].angle = Math.Pi;
+ }
+for (i = 0; i < 3; i++)
+ {
+ swirl_height = Math.Min(Window.GetWidth(), Window.GetHeight()) * swirls[i].height_p;
+ swirl_width = swirl_height * swirlaxy_image.GetWidth() / swirlaxy_image.GetHeight();
+ swirl_image = swirlaxy_image.Scale(swirl_width, swirl_height);
+ swirl_image = swirl_image.Rotate(swirls[i].angle);
+ swirl_sprites[i] = Sprite();
+ if (swirls[i].x >= 0)
+ swirl_sprites[i].SetX(Window.GetWidth() * swirls[i].x);
+ else
+ swirl_sprites[i].SetX(Window.GetWidth() * (1 + swirls[i].x) - swirl_image.GetWidth());
+ if (swirls[i].y >= 0)
+ swirl_sprites[i].SetY(Window.GetHeight() * swirls[i].y);
+ else
+ swirl_sprites[i].SetY(Window.GetHeight() * (1 + swirls[i].y) - swirl_image.GetHeight());
+ swirl_sprites[i].SetImage(swirl_image);
+ }
+
+#------------------------------- Stars ---------------------------------------------
+# Load 3 star images
+star_white_image = Image("star-white.png");
+star_fuzzy_image = Image("star-fuzzy.png");
+star_red_image = Image("star-red.png");
+star_white_small_image = Image("star-white-small.png");
+star_fuzzy_small_image = Image("star-fuzzy-small.png");
+star_red_small_image = Image("star-red-small.png");
+
+# Initialize the random seed depending on the resolution
+pixels = Window.GetWidth() * Window.GetHeight();
+while (pixels % 10 == 0)
+ {
+ pixels = pixels / 10;
+ Math.Random();
+ }
+for (i = 0; i < pixels % 10; i++)
+ Math.Random();
+
+# Create all star sprites
+for (i = 0; i < NUM_STARS; i++)
+ {
+ # Randomly choose star image; white/fuzzy/red have 2/1/1 weights
+ star_type = Math.Random() * 4;
+ if (star_type < 2)
+ {
+ selected_image.big = star_white_image;
+ selected_image.small = star_white_small_image;
+ }
+ else if (star_type < 3)
+ {
+ selected_image.big = star_fuzzy_image;
+ selected_image.small = star_fuzzy_small_image;
+ }
+ else
+ {
+ selected_image.big = star_red_image;
+ selected_image.small = star_red_small_image;
+ }
+
+ # Choose random size
+ star_scaled_size = MAX_STAR_SIZE * Math.Random();
+ # Adapt the source image depending on the scale, smaller scales on big images
+ # don't render so nicely.
+ if (star_scaled_size > selected_image.small.GetHeight()
+ || star_scaled_size > selected_image.small.GetWidth())
+ star_image = selected_image.big;
+ else
+ star_image = selected_image.small;
+ transformed_image = star_image.Scale(star_scaled_size, star_scaled_size);
+
+ # Random rotation of a 5 branch stars, we only need to rotate 2 * Pi / 5 at maximum.
+ transformed_image = transformed_image.Rotate(2 * Math.Pi / 5 * Math.Random());
+ stars[i] = Sprite(transformed_image);
+
+ # Randomize position, we accept that stars may be half out of the viewport
+ # in each direction
+ star_x = Math.Random() * (Window.GetWidth() + transformed_image.GetWidth())
+ - transformed_image.GetWidth() / 2;
+ star_y = Math.Random() * (Window.GetHeight() + transformed_image.GetHeight())
+ - transformed_image.GetHeight() / 2;
+ stars[i].SetPosition(star_x, star_y, -20); # Stars go behind other elements.
+ }
+
+#------------------------------- Rocket --------------------------------------------
+# Load all rocket images for animation
+rocket_height = Math.Min(Window.GetWidth(), Window.GetHeight()) * 0.145;
+for (i = 0; i < 4; i++)
+ {
+ rocket_image = Image("rocket" + i + ".png");
+ rocket_scale_factor = rocket_height / rocket_image.GetHeight();
+ rocket_images[i] = rocket_image.Scale(rocket_image.GetWidth() * rocket_scale_factor,
+ rocket_image.GetHeight() * rocket_scale_factor);
+ }
+rocket_flame_index = 0;
+rocket_sprite = Sprite();
+
+# Rocket trajectory
+# Take a point somwhere in the middle to compute the parabola
+middle_x = Window.GetWidth() * 0.42;
+middle_y = Window.GetHeight() * 0.42;
+# Parabole coeffs so that y = a.x^2 + b.x + c for the earth, planet and middle points
+# Use the earth and planet centers instead of top left corner
+earth_cx = earth_x + earth_images[0].GetWidth()/2;
+earth_cy = earth_y + earth_images[0].GetHeight()/2;
+planet_cx = planet_x + planet_image.GetWidth()/2;
+planet_cy = planet_y + planet_image.GetHeight()/2;
+a = ((earth_cy-middle_y)/(earth_cx-middle_x)-(earth_cy-planet_cy)/(earth_cx-planet_cx))/(middle_x-planet_cx);
+b = (middle_y-planet_cy)/(middle_x-planet_cx)-a*(middle_x+planet_cx);
+c = earth_cy-a*earth_cx*earth_cx-b*earth_cx;
+rocket_x_start = earth_cx + Window.GetWidth() * 0.1; # Don't start right on the earth
+rocket_x_end = planet_cx - Window.GetWidth() * 0.1; # Don't reach the planet
+
+# Set initial position
+rocket_x = rocket_x_start;
+rocket_y = a*rocket_x*rocket_x+b*rocket_x+c;
+alpha = 2*a*rocket_x + b;
+
+# Set flame status and rocket direction.
+has_rocket = 0;
+rocket_comes_back = 0;
+if (Plymouth.GetMode() == "boot")
+ {
+ has_rocket = 1;
+ rocket_comes_back = 0;
+ }
+if (Plymouth.GetMode() == "shutdown" || Plymouth.GetMode() == "suspend")
+ {
+ has_rocket = 1;
+ rocket_comes_back = 1;
+ }
+if (Plymouth.GetMode() == "resume")
+ {
+ has_rocket = 1;
+ rocket_comes_back = 0;
+ }
+
+#------------------------------- Animation -----------------------------------------
+progress = 0;
+fun refresh_callback ()
+ {
+ progress++;
+
+ # Rocket, update 50/3 times per second
+ if (progress % 3 == 0)
+ {
+ # 6 states for the rocket flame: 1, 2, 3, 4, 3, 2
+ rocket_flame_index = (rocket_flame_index + 1) % 6;
+ rocket_image = rocket_images[3 - Math.Abs(rocket_flame_index - 3)];
+ rotated_rocket = rocket_image.Rotate(alpha);
+
+ rocket_sprite.SetImage(rotated_rocket);
+ rocket_sprite.SetPosition(rocket_x - rotated_rocket.GetWidth()/2,
+ rocket_y - rotated_rocket.GetHeight()/2,
+ -10);
+ }
+
+ # Earth glow, update 10 times per second
+ if (earth_glow_index != 0 && progress % 5 == 0)
+ {
+ earth_glow_anim = Math.Int(3 * Math.Random()) - 1;
+ earth_glow_index = Math.Clamp(earth_glow_index + earth_glow_anim, 1, 4);
+ earth_sprite.SetImage(earth_images[earth_glow_index]);
+ }
+
+ # Stars dim, update 5 times per second
+ if (progress % 10 == 0)
+ {
+ for (i = 0; i < NUM_STARS; i++)
+ {
+ # Reset star to visible by 0.05 steps
+ star_opacity = stars[i].GetOpacity();
+ if (star_opacity < 1)
+ stars[i].SetOpacity(star_opacity + 0.05);
+
+ # 10% chance to dim the star
+ if (Math.Random() < 0.1)
+ stars[i].SetOpacity(0.8);
+ }
+ }
+ }
+
+Plymouth.SetRefreshFunction (refresh_callback);
+
+#------------------------------- Dialogue ------------------------------------------
+
+status = "normal";
+
+fun dialog_setup()
+ {
+ local.box;
+ local.lock;
+ local.entry;
+
+ box.image = Image("box.png");
+ lock.image = Image("lock.png");
+ entry.image = Image("entry.png");
+
+ box.sprite = Sprite(box.image);
+ box.x = Window.GetWidth() / 2 - box.image.GetWidth ()/2;
+ box.y = Window.GetHeight() / 2 - box.image.GetHeight()/2;
+ box.z = 10000;
+ box.sprite.SetPosition(box.x, box.y, box.z);
+
+ lock.sprite = Sprite(lock.image);
+ lock.x = box.x + box.image.GetWidth()/2 - (lock.image.GetWidth() + entry.image.GetWidth()) / 2;
+ lock.y = box.y + box.image.GetHeight()/2 - lock.image.GetHeight()/2;
+ lock.z = box.z + 1;
+ lock.sprite.SetPosition(lock.x, lock.y, lock.z);
+
+ entry.sprite = Sprite(entry.image);
+ entry.x = lock.x + lock.image.GetWidth();
+ entry.y = box.y + box.image.GetHeight()/2 - entry.image.GetHeight()/2;
+ entry.z = box.z + 1;
+ entry.sprite.SetPosition(entry.x, entry.y, entry.z);
+
+ global.dialog.box = box;
+ global.dialog.lock = lock;
+ global.dialog.entry = entry;
+ global.dialog.bullet_image = Image("bullet.png");
+ dialog_opacity (1);
+ }
+
+fun dialog_opacity(opacity)
+ {
+ dialog.box.sprite.SetOpacity (opacity);
+ dialog.lock.sprite.SetOpacity (opacity);
+ dialog.entry.sprite.SetOpacity (opacity);
+ for (index = 0; dialog.bullet[index]; index++)
+ {
+ dialog.bullet[index].sprite.SetOpacity(opacity);
+ }
+ }
+
+fun display_normal_callback ()
+ {
+ global.status = "normal";
+ if (global.dialog)
+ dialog_opacity (0);
+ }
+
+fun display_password_callback (prompt, bullets)
+ {
+ global.status = "password";
+ if (!global.dialog)
+ dialog_setup();
+ else
+ dialog_opacity(1);
+ for (index = 0; dialog.bullet[index] || index < bullets; index++)
+ {
+ if (!dialog.bullet[index])
+ {
+ dialog.bullet[index].sprite = Sprite(dialog.bullet_image);
+ dialog.bullet[index].x = dialog.entry.x + index * dialog.bullet_image.GetWidth();
+ dialog.bullet[index].y = dialog.entry.y + dialog.entry.image.GetHeight() / 2 - dialog.bullet_image.GetHeight() / 2;
+ dialog.bullet[index].z = dialog.entry.z + 1;
+ dialog.bullet[index].sprite.SetPosition(dialog.bullet[index].x, dialog.bullet[index].y, dialog.bullet[index].z);
+ }
+ if (index < bullets)
+ dialog.bullet[index].sprite.SetOpacity(1);
+ else
+ dialog.bullet[index].sprite.SetOpacity(0);
+ }
+ }
+
+Plymouth.SetDisplayNormalFunction(display_normal_callback);
+Plymouth.SetDisplayPasswordFunction(display_password_callback);
+
+#------------------------------- Progress Bar ------------------------------------------
+# No "progress bar" per se, we use the rocket position
+
+fun progress_callback (duration, progress)
+ {
+ if (rocket_comes_back)
+ {
+ # Rocket position
+ rocket_x = rocket_x_end - progress * (rocket_x_end - rocket_x_start);
+ rocket_y = a*rocket_x*rocket_x + b*rocket_x + c;
+ # Rocket orientation
+ alpha = Math.ATan2(2*a*rocket_x + b, 1) + Math.Pi;
+ }
+ else
+ {
+ # Rocket position
+ rocket_x = rocket_x_start + progress * (rocket_x_end - rocket_x_start);
+ rocket_y = a*rocket_x*rocket_x + b*rocket_x + c;
+ # Rocket orientation
+ alpha = Math.ATan2(2*a*rocket_x + b, 1);
+ }
+ }
+
+Plymouth.SetBootProgressFunction(progress_callback);
+
+#------------------------------- Root filesystem mount ---------------------------------
+
+fun root_mounted_callback ()
+ {
+ # On boot show earth glow starting when root filesystem is mounted
+ earth_glow_index = 1;
+ }
+
+Plymouth.SetRootMountedFunction(root_mounted_callback);
+
+#------------------------------- Quit --------------------------------------------------
+
+fun quit_callback ()
+ {
+ }
+
+Plymouth.SetQuitFunction(quit_callback);
+
+#------------------------------- Message -----------------------------------------------
+
+msg_sprites; # Declare global variable
+num_displayed_msg = 0; # Current number of message being displayed
+next_msg_idx = 0; # Index of the message to be displayed next in the msg_sprites table
+next_msg_y; # Y of next message to display
+fun message_callback (text)
+ {
+ if (num_displayed_msg < MAX_MSG_DISPLAYED)
+ {
+ # We've not reached max number of messages
+ # Compute next y
+ next_msg_y = 10;
+ for (i = 0; i < num_displayed_msg; i++)
+ next_msg_y += msg_sprites[i].GetImage().GetHeight() + 1; # 1px between lines
+ num_displayed_msg++;
+ }
+ else
+ {
+ # We've reached max number of messages
+ # Move all existing messages one line up
+ move_y_by = -1 - msg_sprites[(next_msg_idx + 1) % MAX_MSG_DISPLAYED].GetImage().GetHeight();
+ for (i = 0; i < MAX_MSG_DISPLAYED; i++)
+ {
+ msg = msg_sprites[(next_msg_idx + 1 + i) % MAX_MSG_DISPLAYED];
+ msg.SetY(msg.GetY() + move_y_by);
+ }
+ }
+ next_msg_image = Image.Text(text, 1, 1, 1, 1);
+ msg_sprites[next_msg_idx] = Sprite();
+ msg_sprites[next_msg_idx].SetPosition(10, next_msg_y, 10000);
+ msg_sprites[next_msg_idx].SetImage(next_msg_image);
+
+ next_msg_idx = (next_msg_idx + 1) % MAX_MSG_DISPLAYED;
+ }
+
+Plymouth.SetMessageFunction(message_callback);
Index: plymouth/spacefun/earth2.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/earth2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/earth3.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/earth3.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/earth4.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/earth4.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/bullet.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/bullet.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/star-red-small.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/star-red-small.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/star-white.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/star-white.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/lock.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/lock.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: plymouth/spacefun/box.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: plymouth/spacefun/box.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: debian/control
===================================================================
--- debian/control (.../5.0.6) (revision 221)
+++ debian/control (.../6.0.2) (revision 221)
@@ -7,7 +7,7 @@
Yves-Alexis Perez <corsac@debian.org>
Build-Depends: cdbs, debhelper (>= 6)
# libusplash-dev, imagemagick, librsvg2-bin
-Standards-Version: 3.8.0
+Standards-Version: 3.9.1
Homepage: http://www.debian.org/devel/debian-desktop
Vcs-Browser: http://svn.debian.org/wsvn/debian-desktop/packages/trunk/desktop-base
Vcs-Svn: svn://svn.debian.org/debian-desktop/packages/trunk/desktop-base
Index: debian/postinst
===================================================================
--- debian/postinst (.../5.0.6) (revision 221)
+++ debian/postinst (.../6.0.2) (revision 221)
@@ -2,6 +2,9 @@
#DEBHELPER#
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/kde3/kdeglobals 6.0.1 -- "$@"
+fi
if [ "${1}" = "configure" ] && [ "$2" != "" ] ; then
@@ -17,49 +20,82 @@
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
- /usr/share/images/desktop-base/moreblue-orbit-wallpaper.svg 60
+ /usr/share/images/desktop-base/spacefun-wallpaper.svg 60
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
- /usr/share/images/desktop-base/moreblue-orbit-wallpaper-widescreen.svg 55
+ /usr/share/images/desktop-base/spacefun-wallpaper-widescreen.svg 55
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
- /usr/share/images/desktop-base/nightly-wallpaper.png 50
+ /usr/share/images/desktop-base/moreblue-orbit-wallpaper.svg 50
update-alternatives --install \
/usr/share/images/desktop-base/desktop-background \
desktop-background \
- /usr/share/images/desktop-base/debian-blueish-wallpaper.svg 40
+ /usr/share/images/desktop-base/moreblue-orbit-wallpaper-widescreen.svg 50
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-background \
+ desktop-background \
+ /usr/share/images/desktop-base/nightly-wallpaper.png 40
+
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-background \
+ desktop-background \
+ /usr/share/images/desktop-base/debian-blueish-wallpaper.svg 30
+
# Alternatives for the splash
update-alternatives --install \
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
- /usr/share/images/desktop-base/moreblue-orbit-splash.png 50
+ /usr/share/images/desktop-base/spacefun-splash.svg 50
update-alternatives --install \
/usr/share/images/desktop-base/desktop-splash \
desktop-splash \
- /usr/share/images/desktop-base/gnome-splash-curves.png 40
+ /usr/share/images/desktop-base/moreblue-orbit-splash.png 40
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-splash \
+ desktop-splash \
+ /usr/share/images/desktop-base/gnome-splash-curves.png 30
+
# Alternatives for grub
update-alternatives --install \
- /usr/share/images/desktop-base/desktop-grub \
+ /usr/share/images/desktop-base/desktop-grub.png \
desktop-grub \
+ /usr/share/images/desktop-base/spacefun-grub.png 15
+
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-grub.png \
+ desktop-grub \
+ /usr/share/images/desktop-base/spacefun-grub-widescreen.png 14
+
+ update-alternatives --install \
+ /usr/share/images/desktop-base/desktop-grub.png \
+ desktop-grub \
/usr/share/images/desktop-base/moreblue-orbit-grub.png 10
# GRUB background
if which update-grub2 > /dev/null ; then
+ sync
update-grub2 || true
fi
+ # Splashy
if [ -x /sbin/splashy_config ] && [ -w /etc/splashy/config.xml ]; then
- splashy_config --set-theme moreblue-orbit
+ splashy_config --set-theme spacefun
fi
+ # Plymouth
+ if [ -x /usr/sbin/plymouth-set-default-theme ];
+ then
+ plymouth-set-default-theme spacefun ||true
+ fi
+
if [ -x /usr/sbin/update-initramfs ]; then
update-initramfs -u
fi
Index: debian/postrm
===================================================================
--- debian/postrm (.../5.0.6) (revision 221)
+++ debian/postrm (.../6.0.2) (revision 221)
@@ -2,9 +2,21 @@
#DEBHELPER#
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/kde3/kdeglobals 6.0.1 -- "$@"
+fi
+
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
if which update-grub2 > /dev/null ; then
update-grub2 || true
fi
fi
+if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
+ if [ -x /usr/sbin/plymouth-set-default-theme ];
+ then
+ plymouth-set-default-theme -r -R ||true
+ fi
+fi
+
+
Index: debian/preinst
===================================================================
--- debian/preinst (.../5.0.6) (revision 221)
+++ debian/preinst (.../6.0.2) (revision 221)
@@ -1,6 +1,9 @@
#!/bin/sh -e
#DEBHELPER#
+if dpkg-maintscript-helper supports rm_conffile 2>/dev/null; then
+ dpkg-maintscript-helper rm_conffile /etc/kde3/kdeglobals 6.0.1 -- "$@"
+fi
if [ "${1}" = "upgrade" ]; then
if dpkg --compare-versions ${2} lt 0.3.11 && dpkg --compare-versions ${2} gt 0.3.5; then
Index: debian/prerm
===================================================================
--- debian/prerm (.../5.0.6) (revision 221)
+++ debian/prerm (.../6.0.2) (revision 221)
@@ -5,6 +5,12 @@
if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
# remove background alternatives
update-alternatives --remove desktop-background \
+ /usr/share/images/desktop-base/spacefun-wallpaper.svg
+
+ update-alternatives --remove desktop-background \
+ /usr/share/images/desktop-base/spacefun-wallpaper-widescreen.svg
+
+ update-alternatives --remove desktop-background \
/usr/share/images/desktop-base/moreblue-orbit-wallpaper.svg
update-alternatives --remove desktop-background \
@@ -25,6 +31,12 @@
# remove grub alternatives
update-alternatives --remove desktop-grub \
+ /usr/share/images/desktop-base/spacefun-grub.png
+
+ update-alternatives --remove desktop-grub \
+ /usr/share/images/desktop-base/spacefun-grub-widescreen.png
+
+ update-alternatives --remove desktop-grub \
/usr/share/images/desktop-base/moreblue-orbit-grub.png
fi
Index: debian/changelog
===================================================================
--- debian/changelog (.../5.0.6) (revision 221)
+++ debian/changelog (.../6.0.2) (revision 221)
@@ -1,9 +1,85 @@
-desktop-base (5.0.7) UNRELEASED; urgency=low
+desktop-base (6.0.2) unstable; urgency=low
+ * ksplash/spacefun/Theme.rc:
+ - revert name change, it should follow directory name.
+ * splashy/spacefun:
+ - include images without “Debian” logo, thanks to Ulrich Hansen.
+ * ./kdm-theme/kdm.d/10_desktop-base:
+ - update path, KDE files are now in /usr/share/kde4/apps.
+ * plymouth:
+ - add spacefun theme from Aurelien Couderc.
+ * Makefile:
+ - install spacefun plymouth theme
+ * debian/post{inst,rm}: configure plymouth theme if plymouth is installed.
+ * debian/copyright updated for plymouth theme.
+
+ -- Yves-Alexis Perez <corsac@debian.org> Sat, 27 Nov 2010 15:58:09 +0100
+
+desktop-base (6.0.1) unstable; urgency=low
+
+ * grub/grub_background.sh: invert highlight and normal text color for better
+ readability.
+ * run optipng on png files.
+ * debian/preinst, debian/postinst, debian/postrm:
+ - remove /etc/kde3/kdeglobals using dpkg-maintscript-helper closes: #603810
+ * kdesktoprc:
+ - use the desktop-background alternative in KDE config.
+ * Makefile:
+ - re-introduce kdeglobals, this time for KDE4.
+ - install KDE4 stuff in /usr/share/kde4/*.
+ - don't install -moodin ksplash themes.
+ - install spacefun ksplash theme, remove previous themes, not working with
+ KDE4.
+ * ksplash:
+ - *-moodin dropped, moodin is a KDE3 theme engine.
+ - remove all other themes not ported to KDE4.
+ - spacefun theme added
+ * ksplashrc:
+ - use spacefun theme
+ * kdesktoprc replaced by plasma-desktop-appletsrc for KDE4.
+
+ -- Yves-Alexis Perez <corsac@debian.org> Sun, 21 Nov 2010 11:07:50 +0100
+
+desktop-base (6.0.0) unstable; urgency=low
+
+ * The “Welcome Noémie” upload, adding Squeeze artwork.
* debian/control:
- update kde suggest to kde-standards. closes: #548244
+ - update standards version to 3.9.1.
+ * backgrounds:
+ - add SpaceFun wallpaper
+ * slashy:
+ - add SpaceFun theme.
+ - drop completely Moreblue Orbit theme.
+ * kdm-theme:
+ - add SpaceFun theme.
+ - configure SpaceFun as the default theme.
+ * debian/postinst:
+ - add SpaceFun alternative at maximum level (default Squeeze theme).
+ - rename grub alternative to add png extension so grub can find it.
+ - run sync before updating grub to be sure the grub background has been
+ written to disk.
+ * debian/prerm:
+ - rename grub alternative to add png extension.
+ * Makefile:
+ - drop unused rules for KDE3 and Xfce 4.4.
+ - add SpaceFun gdm3 theme.
+ - add SpaceFun kdm theme.
+ - install grub theme and script.
+ * {ksplash,kdm}-theme/moreblue-orbit{-default}:
+ - drop “Debian” word from image to only use DFSG-free logo. closes: #587668
+ * debian/copyright updated for the new theme.
+ * grub:
+ - add SpaceFun grub theme.
+ - add a grub_background.sh which will override settings in grub and
+ correctly set the default theme.
+ * debian/README.Debian updated.
+ * splash:
+ - add SpaceFun splash.
+ * profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml:
+ - update colors to match new splash screen.
- -- Yves-Alexis Perez <corsac@debian.org> Thu, 24 Sep 2009 23:24:03 +0200
+ -- Yves-Alexis Perez <corsac@debian.org> Mon, 15 Nov 2010 19:58:48 +0100
desktop-base (5.0.6) unstable; urgency=low
Index: debian/copyright
===================================================================
--- debian/copyright (.../5.0.6) (revision 221)
+++ debian/copyright (.../6.0.2) (revision 221)
@@ -66,5 +66,14 @@
- SVG background, backgrounds/debian-blueish-wallpaper.svg.
- PNG splash, splash/gnome-splash-curves.png.
+The SpaceFun theme is © 2010 Valessio S. Brito and released under the GPLv2.
+KDM and Splashy themes are © 2010 Yves-Alexis Perez using artwork from Valessio
+S. Brito, and are released under GPLv2.
+
+Spacefun plymouth theme is © 2010 Aurelien Couderc and released under the GPLv3 license, using artwork from Valessio S. Brito.
+
The GPL license (version 2) can be found in plain text format, on Debian
systems, at /usr/share/common-licenses/GPL-2
+
+The GPL license (version 3) can be found in plain text format, on Debian
+systems, at /usr/share/common-licenses/GPL-3
Index: debian/README.Debian
===================================================================
--- debian/README.Debian (.../5.0.6) (revision 221)
+++ debian/README.Debian (.../6.0.2) (revision 221)
@@ -19,39 +19,28 @@
1.2. Pixmaps
/usr/share/pixmaps/debian-security.png
-1.3. Splash and Wallpapers
+1.3. Splash, wallpapers and grub images
-We have just two splash and two wallpapers for each window manager (not
-considering the originals in .xcf).
-One pair (splash / wallpaper) will be used during development
-cycle (testing/sid) and other to release.
+Wallpapers are provided in two svg variant, one standard aspect (4/3) and one
+widescreen (16/9). You can switch from one another using the alternatives.
+Using the same system you can select one of the older theme variant. Beware
+that changing alternative means at the next package upgrade it won't be
+automatically reverted to the default choice.
-/usr/share/images/desktop-base/gnome-default-splash.png (symlink)
-/usr/share/images/desktop-base/gnome-default-wallpaper.png (symlink)
+For wallpaper you can run:
-/usr/share/images/desktop-base/splash/gnome-debian-sid-splash.png
-/usr/share/images/desktop-base/wallpapers/gnome-debian-sid-wp.png
+ sudo update-alternatives --config desktop-background
-Before Etch we will add the images below and the symlinks above will
-point to this pair:
-/usr/share/images/desktop-base/splash/gnome-debian-etch-splash.png
-/usr/share/images/desktop-base/wallpapers/gnome-debian-etch-wp.png
+For splash screens you can run:
-1.4. Boot splash
+ sudo update-alternatives --config desktop-splash
-desktop-base provides a theme for splashy, in
-/usr/share/splashy/themes/moreblue-orbit. Previously the theme was in
-/etc/splashy but since splashy people move the themes to /usr/share and
-replaced the folder by a symlink, we had to follow. If you modified the
-theme before, you should be able to find it in /etc/splashy.dpkg-old.
+For grub, you can select standard or widescreen version too, using:
-If you installed splashy before desktop-base, the MoreBlue-Orbit theme will
-be automatically configured. But if you install splashy after desktop-base,
-you'll need to run the following command to enable it:
+ sudo update-alternatives --config desktop-grub
-# dpkg-reconfigure desktop-base
-
2. Desktop files
+
/usr/share/desktop-base/debian-homepage.desktop
/usr/share/desktop-base/debian-reference.desktop
/usr/share/desktop-base/debian-security.desktop
@@ -76,7 +65,7 @@
'svg' or 'xcf' and don't violate copyright.
4. Window Managers
-desktop-base is used by GNOME/KDE/XFCE.
+desktop-base is used by GNOME/KDE/Xfce.
If you're responsible for a WM in Debian and wants to use
desktop-base artwork or add your own image (wallpaper, splash,
Index: splashy/spacefun/theme.xml
===================================================================
--- splashy/spacefun/theme.xml (.../5.0.6) (revision 0)
+++ splashy/spacefun/theme.xml (.../6.0.2) (revision 221)
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<splashy xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://splashy.alioth.debian.org/schemas/1.1/theme.xsd";>
+ <info>
+ <!-- theme name is case sensitive. use directory name -->
+ <name>spacefun</name>
+ <version>1.0</version>
+ <description>SpaceFun theme</description>
+ <urls></urls>
+ <author>Valessio Brito >valessio@debianart.org<</author>
+ </info>
+ <progressbar>
+ <!-- here are tags to set the bar... x coordinate,
+ y coordinate, width and height are for the progress bar.
+ Remember that x, y, width and height are expressed in percentage -->
+ <dimension>
+ <x>35</x>
+ <y>50</y>
+ <width>30</width>
+ <height>2</height>
+ </dimension>
+ <!-- here you can set the color of the progressbar...
+ set the amount of red, green, blue and alpha channel.
+ Remember that the max value is 255 and the minumun value is 0-->
+ <color>
+ <red>211</red>
+ <green>14</green>
+ <blue>43</blue>
+ <alpha>128</alpha>
+ </color>
+ <!-- whether or not you want a border around the progressbar. default: no -->
+ <border>
+ <enable>yes</enable>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ <alpha>255</alpha>
+ </color>
+ </border>
+ <!-- here you can set the color of the progressbar background
+ set the amount of red, green, blue and alpha channel.
+ Remember that the max value is 255 and the minumun value is 0-->
+ <background>
+ <color>
+ <red>127</red>
+ <green>127</green>
+ <blue>127</blue>
+ <alpha>125</alpha>
+ </color>
+ </background>
+ <direction>
+ <boot>forward</boot>
+ <shutdown>backward</shutdown>
+ <resume>forward</resume>
+ <suspend>backward</suspend>
+ </direction>
+ <visibility>
+ <boot>yes</boot>
+ <shutdown>yes</shutdown>
+ <resume>yes</resume>
+ <suspend>yes</suspend>
+ </visibility>
+ </progressbar>
+ <!-- conventional path: /etc/splashy/themes + theme-name -->
+ <background>
+ <boot>go.png</boot>
+ <shutdown>back.png</shutdown>
+ <resume>go.png</resume>
+ <suspend>back.png</suspend>
+ <errorimg>error.png</errorimg>
+ <!-- resolution of the images. this value affects where
+ the progressbar will be drawn. If VALUE <= 0, then percentages
+ of the screen width and hight will be assumed -->
+ <dimension>
+ <!-- NOTE: x and y are not used by splashy -->
+ <x>0</x>
+ <y>0</y>
+ <width>0</width>
+ <height>0</height>
+ </dimension>
+ </background>
+ <textbox>
+ <!-- whether you want the textbox always
+ shown or no. If no, it will be shown only on error,
+ see autoverboseonerror -->
+ <enable>no</enable>
+ <!-- here are tags to set the text area... x coordinate,
+ y coordinate, width and height are for the text area.
+ Remember that x, y, width and height are expressed in percentage
+ or pixel units -->
+ <dimension>
+ <x>20</x>
+ <y>50</y>
+ <width>60</width>
+ <height>40</height>
+ </dimension>
+ <!-- here you can set the color of the text area...
+ set the amount of red, green, blue and alpha channel.
+ Remember that the max value is 255 and the minumun value is 0-->
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ <alpha>127</alpha>
+ </color>
+ <!-- whether or not you want a border around the progressbar. default: no -->
+ <border>
+ <enable>yes</enable>
+ <color>
+ <red>0</red>
+ <green>0</green>
+ <blue>0</blue>
+ <alpha>255</alpha>
+ </color>
+ </border>
+ <text>
+ <!-- font file to use, path relative to theme -->
+ <font>
+ <file>FreeMono.ttf</file>
+ <height>10</height>
+ </font>
+ <!-- here you can set the color of the text/font...
+ set the amount of red, green, blue and alpha channel.
+ Remember that the max value is 255 and the minumun value is 0-->
+ <color>
+ <red>128</red>
+ <green>128</green>
+ <blue>32</blue>
+ <alpha>255</alpha>
+ </color>
+ </text>
+ </textbox>
+ <autoverboseonerror>no</autoverboseonerror>
+ <fadein>no</fadein>
+ <fadeout>no</fadeout>
+</splashy>
Index: splashy/spacefun/back.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: splashy/spacefun/back.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: splashy/spacefun/go.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: splashy/spacefun/go.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: splashy/spacefun/error.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: splashy/spacefun/error.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: profiles/kde-profile/share/config/kdesktoprc
===================================================================
--- profiles/kde-profile/share/config/kdesktoprc (.../5.0.6) (revision 221)
+++ profiles/kde-profile/share/config/kdesktoprc (.../6.0.2) (revision 221)
@@ -1,18 +0,0 @@
-[Desktop0]
-BackgroundMode=VerticalGradient
-BlendBalance=100
-BlendMode=NoBlending
-ChangeInterval=60
-Color1=30,114,160
-Color2=192,192,192
-CurrentWallpaper=0
-LastChange=0
-MinOptimizationDepth=1
-MultiWallpaperMode=NoMulti
-Pattern=
-Program=
-ReverseBlending=false
-UseSHM=false
-Wallpaper=/usr/share/images/desktop-base/moreblue-orbit-wallpaper.png
-WallpaperList=
-WallpaperMode=Scaled
Index: profiles/kde-profile/share/config/plasma-desktop-appletsrc
===================================================================
--- profiles/kde-profile/share/config/plasma-desktop-appletsrc (.../5.0.6) (revision 0)
+++ profiles/kde-profile/share/config/plasma-desktop-appletsrc (.../6.0.2) (revision 221)
@@ -0,0 +1,2 @@
+[Containments][1][Wallpaper][image]
+wallpaper=/usr/share/images/desktop-base/desktop-background
Index: profiles/kde-profile/share/config/ksplashrc
===================================================================
--- profiles/kde-profile/share/config/ksplashrc (.../5.0.6) (revision 221)
+++ profiles/kde-profile/share/config/ksplashrc (.../6.0.2) (revision 221)
@@ -1,2 +1,2 @@
[KSplash]
-Theme=moreblue-orbit-default
+Theme=spacefun
Index: profiles/kde-profile/kdeglobals
===================================================================
--- profiles/kde-profile/kdeglobals (.../5.0.6) (revision 221)
+++ profiles/kde-profile/kdeglobals (.../6.0.2) (revision 221)
@@ -1,2 +1,3 @@
[Directories]
dir_config=/usr/share/desktop-base/profiles/kde-profile/share/config/
+dir_wallpaper=/usr/share/images/desktop-base
Index: profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml
===================================================================
--- profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml (.../5.0.6) (revision 221)
+++ profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-session.xml (.../6.0.2) (revision 221)
@@ -6,8 +6,8 @@
<property name="engines" type="empty">
<property name="simple" type="empty">
<property name="Font" type="string" value="Sans 8"/>
- <property name="BgColor" type="string" value="#004f79"/>
- <property name="FgColor" type="string" value="#639fc0"/>
+ <property name="BgColor" type="string" value="#214068"/>
+ <property name="FgColor" type="string" value="#d2dae6"/>
<property name="Image" type="string" value="/usr/share/images/desktop-base/desktop-splash"/>
</property>
</property>
Index: emblems/emblem-debian.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: splash/moreblue-orbit-splash.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: splash/gnome-splash-curves.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: splash/nightly-splash.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: splash/spacefun-splash.svg
===================================================================
Index: splash/gnome-debian-sid-splash.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: gdm3/10_desktop-base
===================================================================
--- gdm3/10_desktop-base (.../5.0.6) (revision 0)
+++ gdm3/10_desktop-base (.../6.0.2) (revision 221)
@@ -0,0 +1,2 @@
+/desktop/gnome/background/picture_filename /usr/share/images/desktop-base/login-background.svg
+/desktop/gnome/background/picture_options zoom
Index: gdm3/background.svg
===================================================================
Index: grub/spacefun-grub.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: grub/spacefun-grub.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: grub/grub_background.sh
===================================================================
--- grub/grub_background.sh (.../5.0.6) (revision 0)
+++ grub/grub_background.sh (.../6.0.2) (revision 221)
@@ -0,0 +1,3 @@
+WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png
+COLOR_NORMAL=light-gray/black
+COLOR_HIGHLIGHT=white/black
Index: grub/spacefun-grub-widescreen.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: grub/spacefun-grub-widescreen.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: source/spacefun/splashy.svg
===================================================================
Index: source/spacefun/wallpaper.svg
===================================================================
Index: source/spacefun/splash.svg
===================================================================
Index: source/spacefun/grub.svg
===================================================================
Index: backgrounds/moreblue-orbit-wallpaper.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: backgrounds/moreblue-orbit-wallpaper-widescreen.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: backgrounds/nightly-wallpaper.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: backgrounds/moreblue-orbit-grub.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: backgrounds/spacefun-wallpaper.svg
===================================================================
Index: backgrounds/gnome-debian-sid-wp.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: backgrounds/spacefun-wallpaper-widescreen.svg
===================================================================
Index: backgrounds/debian-blueish-wallpaper-640x480.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/icon4.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/icon4.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/icon1_anim.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/icon1_anim.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/icon5.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/icon5.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/description.txt
===================================================================
--- ksplash-theme/spacefun/1600x1200/description.txt (.../5.0.6) (revision 0)
+++ ksplash-theme/spacefun/1600x1200/description.txt (.../6.0.2) (revision 221)
@@ -0,0 +1,42 @@
+SCALE ON
+BACKGROUND_IMAGE 0 0 background.png
+SCALE OFF
+
+# the image is 390x234, make it centered, all icons need the same adjustment too
+IMAGE_REL CC 0 0 CC rectangle.png
+
+# these have their relative positions to the rectangle adjusted by -195,-117
+# (i.e. half of the rectangle size)
+# 3,32
+ANIM_REL 1 CC -192 -50 LT 30 icon1_anim.png 85 1
+WAIT_STATE kded
+
+# 69,32
+ANIM_REL 2 CC -126 -50 LT 30 icon2_anim.png 85 1
+WAIT_STATE kcminit
+
+# 135,32
+ANIM_REL 3 CC -60 -50 LT 29 icon3_anim.png 85 1
+WAIT_STATE ksmserver
+
+# 201,32
+ANIM_REL 4 CC 6 -50 LT 30 icon4_anim.png 85 1
+WAIT_STATE wm
+
+# 263,15
+ANIM_REL 5 CC 68 -88 LT 30 icon5_anim.png 85 1
+WAIT_STATE desktop
+
+WAIT_STATE ready
+
+# show the icons fully right before the splash goes away
+STOP_ANIM 1
+IMAGE_REL CC -192 -50 LT icon1.png
+STOP_ANIM 2
+IMAGE_REL CC -126 -50 LT icon2.png
+STOP_ANIM 3
+IMAGE_REL CC -60 -50 LT icon3.png
+STOP_ANIM 4
+IMAGE_REL CC 6 -50 LT icon4.png
+STOP_ANIM 5
+IMAGE_REL CC 68 -88 LT icon5.png
Index: ksplash-theme/spacefun/1600x1200/icon2_anim.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/icon2_anim.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/background.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/icon3_anim.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/icon3_anim.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/icon4_anim.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/icon4_anim.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/icon5_anim.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/icon5_anim.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/rectangle.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/rectangle.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/icon1.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/icon1.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/icon2.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/icon2.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1600x1200/icon3.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1600x1200/icon3.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1024x768/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1024x768/background.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/Preview.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/Preview.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/Theme.rc
===================================================================
--- ksplash-theme/spacefun/Theme.rc (.../5.0.6) (revision 0)
+++ ksplash-theme/spacefun/Theme.rc (.../6.0.2) (revision 221)
@@ -0,0 +1,9 @@
+[KSplash Theme: spacefun]
+Name = SpaceFun Splash Screen
+Description = Debian SpaceFun Splash Screen, with both 4:3 and 16:9, based largely on work by the authors listed...
+Version = 1.0
+Author = Valessio Brito <valessio@debianart.org>, Amir Dizdarević <cancivolonter@gmail.com>, Nuno Pinheiro <nuno@oxygen-icons.org>, Riccardo Iaconelli <riccardo@kde.org> and Marco Martin <notmart@gmail.com>
+Homepage = http://wiki.debian.org/DebianArt/Themes/SpaceFun
+
+# Theme behaviour settings.
+Engine = KSplashX
Index: ksplash-theme/spacefun/1280x1024/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1280x1024/background.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1366x768/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1366x768/background.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: ksplash-theme/spacefun/1920x1080/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: ksplash-theme/spacefun/1920x1080/background.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: debian-desktop-logo.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/spacefun/screenshot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: kdm-theme/spacefun/screenshot.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: kdm-theme/spacefun/boundingbox.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: kdm-theme/spacefun/boundingbox.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: kdm-theme/spacefun/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: kdm-theme/spacefun/background.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: kdm-theme/spacefun/icon-reboot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: kdm-theme/spacefun/icon-reboot.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: kdm-theme/spacefun/spacefun.xml
===================================================================
--- kdm-theme/spacefun/spacefun.xml (.../5.0.6) (revision 0)
+++ kdm-theme/spacefun/spacefun.xml (.../6.0.2) (revision 221)
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE greeter SYSTEM "greeter.dtd">
+<greeter>
+
+<!-- main pic, login pic -->
+<item type="pixmap">
+ <normal file="background.png"/>
+ <pos x="0" y="0" width="100%" height="100%"/>
+
+ <fixed>
+ <item type="pixmap">
+ <normal file="boundingbox.png"/>
+ <pos anchor="c" x="50%" y="50%" width="400" height="282"/>
+
+ <!-- Welcome -->
+ <fixed>
+ <item type="label">
+ <pos anchor="nc" x="50%" y="18%"/>
+ <normal color="#000000" font="Sans Bold 18"/>
+ <stock type="welcome-label"/>
+ </item>
+ </fixed>
+
+ <fixed>
+ <item type="rect">
+ <normal color="#ffff00" alpha="0.0"/>
+ <pos anchor="e" x="50%" y="50%" width="190" height="180"/>
+
+ <!-- username-label -->
+ <fixed>
+ <item type="label">
+ <pos anchor="ne" x="90%" y="40%"/>
+ <normal color="#000000" font="Sans Bold 10"/>
+ <stock type="username-label"/>
+ </item>
+ </fixed>
+
+ <!-- password-label -->
+ <fixed>
+ <item type="label">
+ <pos anchor="ne" x="90%" y="60%"/>
+ <normal color="#000000" font="Sans Bold 10"/>
+ <stock type="password-label"/>
+ </item>
+ </fixed>
+ </item>
+ </fixed>
+
+ <fixed>
+ <item type="rect">
+ <normal color="#00ffff" alpha="0.0"/>
+ <pos anchor="w" x="50%" y="50%" width="190" height="180"/>
+
+ <!-- username-entry -->
+ <fixed>
+ <item type="entry" id="user-entry">
+ <pos anchor="n" x="30%" y="35%" height="25" width="150"/>
+ </item>
+ </fixed>
+
+ <!-- password-entry -->
+ <fixed>
+ <item type="entry" id="pw-entry">
+ <pos anchor="n" x="30%" y="55%" height="25" width="150"/>
+ </item>
+ </fixed>
+ </item>
+ </fixed>
+ </item>
+ </fixed>
+
+ <!-- capslock-warning -->
+ <fixed>
+ <item type="rect" id="caps-lock-warning">
+ <pos anchor="c" x="50%" y="50%" width="box" height="box"/>
+ <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+ <item type="label">
+ <normal color="#000000" font="Sans 12"/>
+ <pos anchor="n" x="50%" y="90"/>
+ <stock type="caps-lock-warning"/>
+ </item>
+ </box>
+ </item>
+ </fixed>
+
+ <!-- Login-Error -->
+ <fixed>
+ <item type="rect" id="pam-error">
+ <pos anchor="c" x="50%" y="50%" width="box" height="box"/>
+ <box orientation="vertical" min-width="400" xpadding="10" ypadding="5" spacing="0">
+ <item type="label">
+ <normal color="#000000" font="Sans 12"/>
+ <pos anchor="n" x="50%" y="60"/>
+ <text>Login failed.</text>
+ </item>
+ </box>
+ </item>
+ </fixed>
+
+</item>
+
+<!-- icons and text in bottom bar -->
+<item type="rect">
+ <pos x="0" y="-60" width="100%" height="60"/>
+
+ <fixed>
+ <item type="pixmap" id="session_button" button="true">
+ <normal file="icon-session.png"/>
+ <pos x="20" y="20"/>
+ </item>
+ </fixed>
+
+ <!-- session-button -->
+ <fixed>
+ <item type="rect" id="session_button" button="true">
+ <pos x="60" y="30" width="110" height="100%"/>
+ <fixed>
+ <item type="label">
+ <normal color="#ffffff" font="Sans Bold 12"/>
+ <prelight color="#bbbbbb" font="Sans Bold 12"/>
+ <active color="#bbbbbb" font="Sans Bold 12"/>
+ <pos y="0" x="0"/>
+ <stock type="session"/>
+ </item>
+ </fixed>
+ </item>
+ </fixed>
+
+ <fixed>
+ <item type="pixmap" id="system_button" button="true">
+ <normal file="icon-reboot.png"/>
+ <pos x="180" y="20"/>
+ </item>
+ </fixed>
+
+ <!-- menu-button -->
+ <fixed>
+ <item type="rect" id="system_button" button="true">
+ <show modes="console" type="system"/>
+ <pos x="215" y="30" width="50" height="100%"/>
+ <fixed>
+ <item type="label">
+ <normal color="#ffffff" font="Sans Bold 12"/>
+ <prelight color="#bbbbbb" font="Sans Bold 12"/>
+ <active color="#bbbbbb" font="Sans Bold 12"/>
+ <pos y="0" x="0"/>
+ <stock type="system"/>
+ </item>
+ </fixed>
+ </item>
+ </fixed>
+
+ <!-- clock -->
+ <fixed>
+ <item type="label" id="clock">
+ <normal color="#ffffff" font="Sans Bold 11"/>
+ <pos anchor="se" x="-20" y="-10"/>
+ <text>%c</text>
+ </item>
+ </fixed>
+</item>
+</greeter>
Index: kdm-theme/spacefun/KdmGreeterTheme.desktop
===================================================================
--- kdm-theme/spacefun/KdmGreeterTheme.desktop (.../5.0.6) (revision 0)
+++ kdm-theme/spacefun/KdmGreeterTheme.desktop (.../6.0.2) (revision 221)
@@ -0,0 +1,8 @@
+[KdmGreeterTheme]
+Encoding=UTF-8
+Greeter=spacefun.xml
+Name=SpaceFun
+Description=SpaceFun KDM Theme
+Author=Yves-Alexis Perez, based on GDM theme
+Copyright=(c) 2010 Yves-Alexis Perez <corsac@debian.org>
+Screenshot=screenshot.png
Index: kdm-theme/spacefun/icon-session.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Property changes on: kdm-theme/spacefun/icon-session.png
___________________________________________________________________
Added: svn:mime-type
+ application/octet-stream
Index: kdm-theme/moreblue-orbit/screenshot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/moreblue-orbit/boundingbox.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/moreblue-orbit/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/moreblue-orbit/icon-reboot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/moreblue-orbit/icon-session.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/moreblue-orbit/background.svg
===================================================================
Index: kdm-theme/debian-moreblue/screenshot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/debian-moreblue/boundingbox.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/debian-moreblue/icon-reboot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/debian-moreblue/icon-session.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/kdm.d/10_desktop-base
===================================================================
--- kdm-theme/kdm.d/10_desktop-base (.../5.0.6) (revision 221)
+++ kdm-theme/kdm.d/10_desktop-base (.../6.0.2) (revision 221)
@@ -1,3 +1,3 @@
USETHEME="true"
-THEME="/usr/share/apps/kdm/themes/moreblue-orbit"
-WALLPAPER="/usr/share/apps/kdm/themes/moreblue-orbit/background.png"
+THEME="/usr/share/kde4/apps/kdm/themes/spacefun"
+WALLPAPER="/usr/share/kde4/apps/kdm/themes/spacefun/background.png"
Index: kdm-theme/nightly/screenshot.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/nightly/boundingbox.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/nightly/background.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/nightly/System.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/nightly/Sessions.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/nightly/System_inactive.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: kdm-theme/nightly/Sessions_inactive.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: Makefile
===================================================================
--- Makefile (.../5.0.6) (revision 221)
+++ Makefile (.../6.0.2) (revision 221)
@@ -3,7 +3,7 @@
INSTALL=install -m 0644
BACKGROUNDS=$(wildcard backgrounds/*.png backgrounds/*.jpg backgrounds/*.svg backgrounds/*.tga)
EMBLEMS=$(wildcard emblems/*png emblems/*icon)
-SPLASH=$(wildcard splash/*.png)
+SPLASH=$(wildcard splash/*.png splash/*.svg)
PIXMAPS=$(wildcard pixmaps/*.png)
DESKTOPFILES=$(wildcard *.desktop)
@@ -14,9 +14,10 @@
# make -C usplash/moreblue-orbit clean
install:
- # splashy theme
- mkdir -p $(DESTDIR)/usr/share/splashy/themes/moreblue-orbit
- $(INSTALL) $(wildcard splashy/moreblue-orbit/*) $(DESTDIR)/usr/share/splashy/themes/moreblue-orbit
+ # splashy themes
+ mkdir -p $(DESTDIR)/usr/share/splashy/themes/spacefun
+ $(INSTALL) $(wildcard splashy/spacefun/*) $(DESTDIR)/usr/share/splashy/themes/spacefun
+
# usplash theme
# make -C usplash/moreblue-orbit install DESTDIR=$(CURDIR)/debian/usplash-theme-debian-desktop/usr/lib/usplash
# background files
@@ -34,43 +35,60 @@
# pixmaps files
mkdir -p $(DESTDIR)/usr/share/pixmaps
$(INSTALL) $(PIXMAPS) $(DESTDIR)/usr/share/pixmaps/
+
+ # KDE Config
+ mkdir -p $(DESTDIR)/usr/share/kde4/config
+ $(INSTALL) profiles/kde-profile/kdeglobals $(DESTDIR)/usr/share/kde4/config
+
# KDM theme
mkdir -p $(DESTDIR)/etc/default/kdm.d
$(INSTALL) kdm-theme/kdm.d/10_desktop-base $(DESTDIR)/etc/default/kdm.d
- mkdir -p $(DESTDIR)/usr/share/apps/kdm/themes/debian-moreblue
- $(INSTALL) $(wildcard kdm-theme/debian-moreblue/*) $(DESTDIR)/usr/share/apps/kdm/themes/debian-moreblue
- mkdir -p $(DESTDIR)/usr/share/apps/kdm/themes/moreblue-orbit
- $(INSTALL) $(wildcard kdm-theme/moreblue-orbit/*) $(DESTDIR)/usr/share/apps/kdm/themes/moreblue-orbit
- mkdir -p $(DESTDIR)/usr/share/apps/kdm/themes/nightly
- $(INSTALL) $(wildcard kdm-theme/nightly/*) $(DESTDIR)/usr/share/apps/kdm/themes/nightly
+
+ mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/spacefun
+ $(INSTALL) $(wildcard kdm-theme/spacefun/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/spacefun
+ mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/debian-moreblue
+ $(INSTALL) $(wildcard kdm-theme/debian-moreblue/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/debian-moreblue
+ mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/moreblue-orbit
+ $(INSTALL) $(wildcard kdm-theme/moreblue-orbit/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/moreblue-orbit
+ mkdir -p $(DESTDIR)/usr/share/kde4/apps/kdm/themes/nightly
+ $(INSTALL) $(wildcard kdm-theme/nightly/*) $(DESTDIR)/usr/share/kde4/apps/kdm/themes/nightly
+
# KSPLASH theme
- mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/debian-moreblue-default
- $(INSTALL) $(wildcard ksplash-theme/debian-moreblue-default/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/debian-moreblue-default
- mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/debian-moreblue-moodin
- $(INSTALL) $(wildcard ksplash-theme/debian-moreblue-moodin/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/debian-moreblue-moodin
- mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-default
- $(INSTALL) $(wildcard ksplash-theme/moreblue-orbit-default/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-default
- mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-moodin
- $(INSTALL) $(wildcard ksplash-theme/moreblue-orbit-moodin/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/moreblue-orbit-moodin
- mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-default
- $(INSTALL) $(wildcard ksplash-theme/nightly-default/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-default
- mkdir -p $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-moodin
- $(INSTALL) $(wildcard ksplash-theme/nightly-moodin/*) $(DESTDIR)/usr/share/apps/ksplash/Themes/nightly-moodin
- # KDE setup
- mkdir -p $(DESTDIR)/etc/kde3
- $(INSTALL) profiles/kde-profile/kdeglobals $(DESTDIR)/etc/kde3
+ install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun
+ $(INSTALL) ksplash-theme/spacefun/Preview.png $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun
+ $(INSTALL) ksplash-theme/spacefun/Theme.rc $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun
+ install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1024x768
+ $(INSTALL) $(wildcard ksplash-theme/spacefun/1024x768/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1024x768
+ install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1280x1024
+ $(INSTALL) $(wildcard ksplash-theme/spacefun/1280x1024/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1280x1024
+ install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1366x768
+ $(INSTALL) $(wildcard ksplash-theme/spacefun/1366x768/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1366x768
+ install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1600x1200
+ $(INSTALL) $(wildcard ksplash-theme/spacefun/1600x1200/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1600x1200
+ install -d $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1920x1080
+ $(INSTALL) $(wildcard ksplash-theme/spacefun/1920x1080/*) $(DESTDIR)/usr/share/kde4/apps/ksplash/Themes/spacefun/1920x1080
+
+ # KDE Config
mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/kde-profile/share/config
$(INSTALL) $(wildcard profiles/kde-profile/share/config/*) $(DESTDIR)/usr/share/desktop-base/profiles/kde-profile/share/config
- # Xfce 4.4
- mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/mcs_settings
- $(INSTALL) $(wildcard profiles/xdg-config/xfce4/mcs_settings/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/mcs_settings
- $(INSTALL) $(wildcard profiles/xdg-config/xfce4/mcs_settings/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/mcs_settings
- mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4-session
- $(INSTALL) $(wildcard profiles/xdg-config/xfce4-session/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4-session
+
# Xfce 4.6
mkdir -p $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml
$(INSTALL) $(wildcard profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/*) $(DESTDIR)/usr/share/desktop-base/profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml
# GNOME background descriptor
mkdir -p $(DESTDIR)/usr/share/gnome-background-properties
$(INSTALL) gnome-backgrounds.xml $(DESTDIR)/usr/share/gnome-background-properties/debian.xml
+ # GDM 3 theme
+ mkdir -p $(DESTDIR)/usr/share/gdm/greeter-config
+ $(INSTALL) gdm3/background.svg $(DESTDIR)/usr/share/images/desktop-base/login-background.svg
+ $(INSTALL) gdm3/10_desktop-base $(DESTDIR)/usr/share/gdm/greeter-config
+ # grub
+ $(INSTALL) grub/spacefun-grub.png $(DESTDIR)/usr/share/images/desktop-base/
+ $(INSTALL) grub/spacefun-grub-widescreen.png $(DESTDIR)/usr/share/images/desktop-base/
+ $(INSTALL) grub/grub_background.sh $(DESTDIR)/usr/share/desktop-base/
+
+ # plymouth
+ install -d $(DESTDIR)/usr/share/plymouth/themes/spacefun
+ $(INSTALL) $(wildcard plymouth/spacefun/*) $(DESTDIR)/usr/share/plymouth/themes/spacefun
+
Index: pixmaps/debian-security.xcf
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: pixmaps/debian-security.png
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
Index: debian/prerm
===================================================================
--- debian/prerm (.../tags/desktop-base/6.0.2) (revision 221)
+++ debian/prerm (.../trunk/desktop-base) (revision 221)
@@ -24,6 +24,9 @@
# remove splash alternatives
update-alternatives --remove desktop-splash \
+ /usr/share/images/desktop-base/spacefun-splash.svg
+
+ update-alternatives --remove desktop-splash \
/usr/share/images/desktop-base/moreblue-orbit-splash.png
update-alternatives --remove desktop-splash \
Index: debian/changelog
===================================================================
--- debian/changelog (.../tags/desktop-base/6.0.2) (revision 221)
+++ debian/changelog (.../trunk/desktop-base) (revision 221)
@@ -1,3 +1,17 @@
+desktop-base (6.0.3) UNRELEASED; urgency=low
+
+ * profiles/kde-profiles:
+ - drop dir_wallpaper to not clutter KDE wallpaper chooser. closes: #605116
+ * debian/prerm:
+ - remove desktop-splash spacefun alternative. closes: #605239
+ * profiles/[...]/xfce4-desktop.xml:
+ - don't set image-style property, default to auto. closes: #523150
+ * cleanup debian/copyright for removed stuff. closes: #594533
+ * debian/pixmaps:
+ - debian-security updated, thanks to Ulrich Hansen. closes: #389155
+
+ -- Yves-Alexis Perez <corsac@debian.org> Tue, 30 Nov 2010 11:00:43 +0100
+
desktop-base (6.0.2) unstable; urgency=low
* ksplash/spacefun/Theme.rc:
Index: debian/copyright
===================================================================
--- debian/copyright (.../tags/desktop-base/6.0.2) (revision 221)
+++ debian/copyright (.../trunk/desktop-base) (revision 221)
@@ -5,21 +5,6 @@
Copyright:
-The debblue "kit" (composed of the background and the splash) was
-created by Jaap Haitsma (jaap at haitsma dot org) and is licensed
-under the GNU General Public License (see below). They can be
-downloaded from the http://debblue.debian.net/downloads.php web page
-in various formats.
-
-The Debian swirl background images included in this package were
-created by gfburke@earthlink.net (Gary Burke), and were derived from
-copyright-free stock artwork. It can be downloaded from
-http://wm.themes.org, as "Debian.tar.gz".
-
-The Debian "bluedeb" background was created by Roger So
-<rogerso@debian.org>, and is under the terms of the BSD license. See
-../backgrounds/bluedeb.COPYING for more information.
-
The debian-background.svg file has been provided by Josselin Mouette
<joss@debian.org>, and is a derivative work of the open use Debian
logo, which has the following copyright notice:
@@ -35,21 +20,11 @@
http://www.debian.org/ if you use it on a web page.
</debian-background.svg>
-The Debian splash screen was created by Mirko Hufnagel
-<mirko@abitur97.de>, and is placed into the public domain.
+The debian-security.xcf file (and the resulting .png file) were created
+by Colin Walters <walters@debian.org> and updated by Ulrich Hansen
+<uhansen@mainz-online.de>. They based on the Debian Open Use Logo and a GNOME
+icon; both are free software.
-The Debian_red splash screen imagem was created by
-<webanetwork@libero.it> and is copyright-free. It can be downloaded
-from http://art.gnome.org/themes/splash_screens/488.php.
-
-The EvolvingTux splash screen was modified by Filip Van Raemdonck
-<mechanix@debian.org> based on a GPL work found at
-http://www.kde-look.org.
-
-The debian-security.xcf file (and the resulting .png file) were
-created by Colin Walters <walters@debian.org> from the Debian Open Use
-Logo and a GNOME icon; both are free software.
-
The debian-official-logo-small.png image is more or less a simple
reformatting of the Debian Official Use Logo.
Index: profiles/kde-profile/kdeglobals
===================================================================
--- profiles/kde-profile/kdeglobals (.../tags/desktop-base/6.0.2) (revision 221)
+++ profiles/kde-profile/kdeglobals (.../trunk/desktop-base) (revision 221)
@@ -1,3 +1,2 @@
[Directories]
dir_config=/usr/share/desktop-base/profiles/kde-profile/share/config/
-dir_wallpaper=/usr/share/images/desktop-base
Index: profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
===================================================================
--- profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (.../tags/desktop-base/6.0.2) (revision 221)
+++ profiles/xdg-config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml (.../trunk/desktop-base) (revision 221)
@@ -19,7 +19,6 @@
</property>
<property name="color-style" type="int" value="1"/>
<property name="image-path" type="string" value="/usr/share/images/desktop-base/default"/>
- <property name="image-style" type="int" value="4"/>
<property name="image-show" type="bool" value="true"/>
<property name="last-image" type="string" value="/usr/share/images/desktop-base/default"/>
<property name="last-single-image" type="string" value="/usr/share/images/desktop-base/default"/>
--- End Message ---