[debian-edu-commits] debian-edu/ 247/437: Try to fix grub 2 theme support (Closes: #570786).

[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 6aa7e4bc84c8c8bcad6eb285cda132f60474ffef
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Sun Mar 7 18:43:55 2010 +0000

    Try to fix grub 2 theme support (Closes: #570786).
---
 art/splash/Makefile.am        | 13 +++++++++++--
 art/splash/Makefile.in        | 13 +++++++++++--
 art/splash/grub_background.sh |  4 ++++
 debian/changelog              |  7 +++++++
 debian/control                |  2 +-
 5 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/art/splash/Makefile.am b/art/splash/Makefile.am
index cf6ceb3..c740bcd 100644
--- a/art/splash/Makefile.am
+++ b/art/splash/Makefile.am
@@ -3,7 +3,7 @@ SPLASH = debian-edu-splash.png debian-edu-splash-live.png
 RLES = $(SPLASH:.png=.rle)
 
 splashdir = $(datadir)/pixmaps/splash
-splash_DATA = $(SPLASH) 
+splash_DATA = $(SPLASH) debian-edu-splash-grub.png
 
 XPMS = splash-debian-edu.xpm
 XPMGZS = $(XPMS:.xpm=.xpm.gz)
@@ -11,12 +11,16 @@ XPMGZS = $(XPMS:.xpm=.xpm.gz)
 grubdir       = /boot/grub
 grubsplashdir = $(grubdir)/splashimages
 grubsplash_DATA = $(XPMGZS)
+grub2splashdir= /usr/share/desktop-base/grub_background.sh
 
 #BUILT_SOURCES = $(XPMGZS) $(RLES)
 
 SUFFIXES = .png .rle .xpm .xpm.gz
 
 install-data-local: $(XPMGZS)
+	$(mkinstalldirs) $(DESTDIR)$(grub2splashdir)
+	$(INSTALL) grub_background.sh $(DESTDIR)$(grub2splashdir)
+
 	$(mkinstalldirs) $(DESTDIR)$(grubsplashdir)
 
 # Make it available as a grub splash image, detected and used by update-grub.
@@ -33,6 +37,11 @@ splash-debian-edu.xpm:
 splash-debian-edu.xpm.gz: splash-debian-edu.xpm
 	gzip -9 < $^ > $@
 
+debian-edu-splash-grub.png:
+	$(MAKE) -C ../usplash background_640x480.png
+	convert -resize 640x480 -colors 14 -background black -depth 8 \
+	    ../usplash/background_640x480.png $@
+
 .png.rle:
 	pngtopnm < $^ | ppmquant 16 | ppmtolss16 "#ffffff=7" "#000000=0" > $@
 .png.xpm:
@@ -42,4 +51,4 @@ splash-debian-edu.xpm.gz: splash-debian-edu.xpm
 
 EXTRA_DIST = $(splash_DATA)
 
-CLEANFILES = $(RLES) $(XPMS) $(XPMGZS)
+CLEANFILES = $(RLES) $(XPMS) $(XPMGZS) debian-edu-splash-grub.png
diff --git a/art/splash/Makefile.in b/art/splash/Makefile.in
index e1a58f6..bf8e141 100644
--- a/art/splash/Makefile.in
+++ b/art/splash/Makefile.in
@@ -140,17 +140,18 @@ top_srcdir = @top_srcdir@
 SPLASH = debian-edu-splash.png debian-edu-splash-live.png
 RLES = $(SPLASH:.png=.rle)
 splashdir = $(datadir)/pixmaps/splash
-splash_DATA = $(SPLASH) 
+splash_DATA = $(SPLASH) debian-edu-splash-grub.png
 XPMS = splash-debian-edu.xpm
 XPMGZS = $(XPMS:.xpm=.xpm.gz)
 grubdir = /boot/grub
 grubsplashdir = $(grubdir)/splashimages
 grubsplash_DATA = $(XPMGZS)
+grub2splashdir = /usr/share/desktop-base/grub_background.sh
 
 #BUILT_SOURCES = $(XPMGZS) $(RLES)
 SUFFIXES = .png .rle .xpm .xpm.gz
 EXTRA_DIST = $(splash_DATA)
-CLEANFILES = $(RLES) $(XPMS) $(XPMGZS)
+CLEANFILES = $(RLES) $(XPMS) $(XPMGZS) debian-edu-splash-grub.png
 all: all-am
 
 .SUFFIXES:
@@ -354,6 +355,9 @@ uninstall-am: uninstall-grubsplashDATA uninstall-splashDATA
 
 
 install-data-local: $(XPMGZS)
+	$(mkinstalldirs) $(DESTDIR)$(grub2splashdir)
+	$(INSTALL) grub_background.sh $(DESTDIR)$(grub2splashdir)
+
 	$(mkinstalldirs) $(DESTDIR)$(grubsplashdir)
 
 # Make it available as a grub splash image, detected and used by update-grub.
@@ -370,6 +374,11 @@ splash-debian-edu.xpm:
 splash-debian-edu.xpm.gz: splash-debian-edu.xpm
 	gzip -9 < $^ > $@
 
+debian-edu-splash-grub.png:
+	$(MAKE) -C ../usplash background_640x480.png
+	convert -resize 640x480 -colors 14 -background black -depth 8 \
+	    ../usplash/background_640x480.png $@
+
 .png.rle:
 	pngtopnm < $^ | ppmquant 16 | ppmtolss16 "#ffffff=7" "#000000=0" > $@
 .png.xpm:
diff --git a/art/splash/grub_background.sh b/art/splash/grub_background.sh
new file mode 100644
index 0000000..32084e1
--- /dev/null
+++ b/art/splash/grub_background.sh
@@ -0,0 +1,4 @@
+# This script is used by /etc/grub.d/05_debian_theme with grub version 2
+WALLPAPER="/usr/share/pixmaps/splash/debian-edu-splash-grub.png"
+COLOR_NORMAL="white/black"
+COLOR_HIGHLIGHT="magenta/black"
diff --git a/debian/changelog b/debian/changelog
index 4de546a..eae21b9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+debian-edu-artwork (0.0.30-5) UNRELEASED; urgency=low
+
+  [ Petter Reinholdtsen ]
+  * Try to fix grub 2 theme support (Closes: #570786).
+
+ -- Petter Reinholdtsen <pere at debian.org>  Sun, 07 Mar 2010 19:43:19 +0100
+
 debian-edu-artwork (0.0.30-4) unstable; urgency=low
 
   [ Petter Reinholdtsen ]
diff --git a/debian/control b/debian/control
index c996b37..d54376a 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Package: debian-edu-artwork
 Architecture: all
 Depends: ${misc:Depends}, libconfig-inifiles-perl
 Suggests: grub (>= 0.95+cvs20040624-10), kdm, debian-edu-artwork-usplash
-Conflicts: grub (<< 0.97-39)
+Conflicts: grub (<< 0.97-39), desktop-base
 Description: Debian Edu themes and artwork
  This package contains Debian Edu themes and artwork.
 

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