[debian-edu-commits] debian-edu/ 198/437: Rewrite grub image conversion to get correct colors.

[Mike Gabriel]

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

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

commit 2a774f3c39a492592a8c648605794ecec9b364f7
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Tue Jul 22 07:48:53 2008 +0000

    Rewrite grub image conversion to get correct colors.
---
 art/splash/Makefile.am | 6 +++++-
 art/splash/Makefile.in | 6 +++++-
 debian/changelog       | 3 ++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/art/splash/Makefile.am b/art/splash/Makefile.am
index c4cae78..55b5cfd 100644
--- a/art/splash/Makefile.am
+++ b/art/splash/Makefile.am
@@ -26,9 +26,13 @@ install-data-local: $(XPMGZS)
 
 # Generate grub image from usplash image for now.  Need to be XPM, 14 colors,
 # 640x480 pixels.  Compression is optional but speed up the boot with modern machines.
+# First convert to JPEG, then to XPM, to make sure the color entries in
+# the XPM are understood by grub.
 splash-debian-edu.xpm:
 	$(MAKE) -C ../usplash background_640x480.png
-	convert -resize 640x480 -colors 14 ../usplash/background_640x480.png splash-debian-edu.xpm
+	convert -resize 640x480 -colors 14 -background black \
+	    ../usplash/background_640x480.png splash-debian-edu.jpeg
+	convert splash-debian-edu.jpeg splash-debian-edu.xpm
 splash-debian-edu.xpm.gz: splash-debian-edu.xpm
 	gzip -9 < $^ > $@
 
diff --git a/art/splash/Makefile.in b/art/splash/Makefile.in
index 5681f71..78ef274 100644
--- a/art/splash/Makefile.in
+++ b/art/splash/Makefile.in
@@ -363,9 +363,13 @@ install-data-local: $(XPMGZS)
 
 # Generate grub image from usplash image for now.  Need to be XPM, 14 colors,
 # 640x480 pixels.  Compression is optional but speed up the boot with modern machines.
+# First convert to JPEG, then to XPM, to make sure the color entries in
+# the XPM are understood by grub.
 splash-debian-edu.xpm:
 	$(MAKE) -C ../usplash background_640x480.png
-	convert -colors 14 ../usplash/background_640x480.png splash-debian-edu.xpm
+	convert -resize 640x480 -colors 14 -background black \
+	    ../usplash/background_640x480.png splash-debian-edu.jpeg
+	convert splash-debian-edu.jpeg splash-debian-edu.xpm
 splash-debian-edu.xpm.gz: splash-debian-edu.xpm
 	gzip -9 < $^ > $@
 
diff --git a/debian/changelog b/debian/changelog
index 721611d..dc77170 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,8 @@
 debian-edu-artwork (0.0.28~svn43119) unstable; urgency=low
 
   [ Petter Reinholdtsen ]
-  * Add rules to build grub splash image.
+  * Add rules to build grub splash image.  Make sure to convert PNG
+    via JPEG to XPM, to avoid incorrect colors.
   * Add conflicts with grub (<< 0.97-39) to make sure a version
     where bug #477791 in update-grub is fixed is used.
   * Add debhelper makers to new postrm and preinst files.

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