[debian-edu-commits] [Git][debian-edu/debian-edu-artwork][master] 5 commits: Downgrade d-e-a-{lines, softwaves} to Suggests to ease upgrade from Stretch.

[WolfgangSchweer]

WolfgangSchweer pushed to branch master at Debian Edu / debian-edu-artwork


Commits:
d472567b by Wolfgang Schweer at 2018-11-22T14:25:47Z
Downgrade d-e-a-{lines,softwaves} to Suggests to ease upgrade from Stretch.

This avoids installing d-e-a-buster manually.

- - - - -
a935b10f by Wolfgang Schweer at 2018-11-22T14:31:09Z
Fix Description: field entry, avoid line break.

- - - - -
f49fe4f2 by Wolfgang Schweer at 2018-11-22T14:32:42Z
Fix bg_image file name.

- - - - -
d89843a1 by Wolfgang Schweer at 2018-11-22T14:34:38Z
Add links to be more desktop-base compliant.

- - - - -
a6a85e57 by Wolfgang Schweer at 2018-11-22T14:46:43Z
Document last commits.

- - - - -


7 changed files:

- art-buster/plymouth/debian-edu-buster.plymouth
- art-buster/plymouth/debian-edu-buster.script
- debian/changelog
- debian/control
- debian/debian-edu-artwork-buster.links
- debian/debian-edu-artwork-lines.links
- debian/debian-edu-artwork-softwaves.links


Changes:

=====================================
art-buster/plymouth/debian-edu-buster.plymouth
=====================================
@@ -1,7 +1,6 @@
 [Plymouth Theme]
 Name=Default theme for Debian Edu 10 Buster
-Description=A theme that features 'futurePrototype' by Alex Makas <radicalmonday at gmail.com>
-and the Debian Edu logo on a blue background
+Description=A theme that features 'futurePrototype' by Alex Makas and the Debian Edu logo on a blue background
 ModuleName=script
 
 [script]


=====================================
art-buster/plymouth/debian-edu-buster.script
=====================================
@@ -149,7 +149,7 @@ logo_pos.x = logo_center.x - logo_size/2;
 logo_pos.y = logo_center.y - logo_size/2;
 
 #------------------------------- Background ----------------------------------------
-bg_image = Image("plymouth_background_future.png");
+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();


=====================================
debian/changelog
=====================================
@@ -1,10 +1,22 @@
 debian-edu-artwork (2.10.1.0.1-2) UNRELEASED; urgency=medium
 
+  [ Holger Levsen ]
   * d/control:
     - suggest debian-edu-artwork-spacefun.
     - add .git to Vcs-git URL.
   * source/lintian-overrides: add upstream-metadata-file-is-missing.
 
+  [ Wolfgang Schweer ]
+  * Downgrade d-e-a-{lines,softwaves} to Suggests to ease upgrade from Stretch.
+    This avoids to install d-e-a-buster manually upon upgrades.
+  * Improve/fix plymouth related artwork files.
+    - debian/debian-edu-artwork-{buster,lines,softwaves}.links:
+      + Add plymouth links to be more desktop-base compliant.
+    - art-buster/plymouth/debian-edu-buster.script:
+      + Fix bg_image file name.
+    - art-buster/plymouth/debian-edu-buster.plymouth:
+      + Fix Description: field entry, avoid line break.
+
  -- Holger Levsen <holger at debian.org>  Thu, 22 Nov 2018 13:26:33 +0100
 
 debian-edu-artwork (2.10.1.0.1-1) unstable; urgency=medium


=====================================
debian/control
=====================================
@@ -24,11 +24,13 @@ Vcs-git: https://salsa.debian.org/debian-edu/debian-edu-artwork.git
 Package: debian-edu-artwork
 Architecture: all
 Depends: ${misc:Depends},
-         debian-edu-artwork-buster | debian-edu-artwork-softwaves | debian-edu-artwork-lines,
+         debian-edu-artwork-buster,
          desktop-base (>= 9.0.7),
          libconfig-inifiles-perl,
          libglib2.0-bin,
-Suggests: debian-edu-artwork-spacefun
+Suggests: debian-edu-artwork-spacefun,
+          debian-edu-artwork-softwaves,
+          debian-edu-artwork-lines,
 Enhances: gdm3,
           ldm,
           lightdm,


=====================================
debian/debian-edu-artwork-buster.links
=====================================
@@ -1 +1,2 @@
 /usr/share/desktop-base/debian-edu-buster-theme/wallpaper /usr/share/desktop-base/debian-edu-buster-theme/lockscreen
+/usr/share/plymouth/themes/debian-edu-buster/ /usr/share/desktop-base/debian-edu-buster-theme/plymouth


=====================================
debian/debian-edu-artwork-lines.links
=====================================
@@ -1 +1,2 @@
 /usr/share/desktop-base/debian-edu-lines-theme/wallpaper /usr/share/desktop-base/debian-edu-lines-theme/lockscreen
+/usr/share/plymouth/themes/debian-edu-lines/ usr/share/desktop-base/debian-edu-lines-theme/plymouth


=====================================
debian/debian-edu-artwork-softwaves.links
=====================================
@@ -1 +1,2 @@
 /usr/share/desktop-base/debian-edu-softwaves-theme/wallpaper /usr/share/desktop-base/debian-edu-softwaves-theme/lockscreen
+/usr/share/plymouth/themes/debian-edu-softwaves/ /usr/share/desktop-base/debian-edu-softwaves-theme/plymouth



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/compare/2a0ec28b76992fea916682ab0777560a4abc23bb...a6a85e570987e8e5c61aa01010255d200c01a271

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/compare/2a0ec28b76992fea916682ab0777560a4abc23bb...a6a85e570987e8e5c61aa01010255d200c01a271
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20181122/c117fdca/attachment-0001.html>