[debian-edu-commits] debian-edu/ 26/437: [ Petter Reinholdtsen ] * Install splash image as /boot/grub/splash.xpm.gz, to make it available for grub.

[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 2c45596e8f996527a1cd7d77424f98e7e58e32a7
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Mon Aug 7 06:48:14 2006 +0000

      [ Petter Reinholdtsen ]
      * Install splash image as /boot/grub/splash.xpm.gz, to make it available
        for grub.
---
 art/splash/Makefile.am            | 13 ++++++++++++-
 art/splash/Makefile.in            | 13 ++++++++++++-
 configure                         |  3 ++-
 debian/changelog                  |  4 ++++
 debian/debian-edu-artwork.install |  1 +
 5 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/art/splash/Makefile.am b/art/splash/Makefile.am
index 3572a94..b32310b 100644
--- a/art/splash/Makefile.am
+++ b/art/splash/Makefile.am
@@ -3,7 +3,18 @@ SPLASH = debian-edu-splash.png
 splashdir = $(datadir)/pixmaps/splash
 splash_DATA = $(SPLASH) 
 
-install-data-local:
+install-data-local: debian-edu-splash.xpm.gz
 	$(mkinstalldirs) $(DESTDIR)$(splashdir)
 
+# Make it available as a grub splash image, detected and used by update-grub
+	$(mkinstalldirs) $(DESTDIR)/boot/grub
+	$(INSTALL_DATA) debian-edu-splash.xpm.gz \
+	   $(DESTDIR)/boot/grub/splash.xpm.gz
+
+debian-edu-splash.xpm.gz: debian-edu-splash.png
+	convert debian-edu-splash.png debian-edu-splash.xpm
+	gzip -9 debian-edu-splash.xpm
+
 EXTRA_DIST = $(splash_DATA)
+
+CLEANFILES = debian-edu-splash.xpm.gz
diff --git a/art/splash/Makefile.in b/art/splash/Makefile.in
index 48027d6..40079ba 100644
--- a/art/splash/Makefile.in
+++ b/art/splash/Makefile.in
@@ -139,6 +139,7 @@ SPLASH = debian-edu-splash.png
 splashdir = $(datadir)/pixmaps/splash
 splash_DATA = $(SPLASH) 
 EXTRA_DIST = $(splash_DATA)
+CLEANFILES = debian-edu-splash.xpm.gz
 all: all-am
 
 .SUFFIXES:
@@ -247,6 +248,7 @@ install-strip:
 mostlyclean-generic:
 
 clean-generic:
+	-test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
 
 distclean-generic:
 	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
@@ -311,8 +313,17 @@ uninstall-am: uninstall-info-am uninstall-splashDATA
 	uninstall-splashDATA
 
 
-install-data-local:
+install-data-local: debian-edu-splash.xpm.gz
 	$(mkinstalldirs) $(DESTDIR)$(splashdir)
+
+# Make it available as a grub splash image, detected and used by update-grub
+	$(mkinstalldirs) $(DESTDIR)/boot/grub
+	$(INSTALL_DATA) debian-edu-splash.xpm.gz \
+	   $(DESTDIR)/boot/grub/splash.xpm.gz
+
+debian-edu-splash.xpm.gz: debian-edu-splash.png
+	convert debian-edu-splash.png debian-edu-splash.xpm
+	gzip -9 debian-edu-splash.xpm
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
 .NOEXPORT:
diff --git a/configure b/configure
index dc0d6e0..6493a70 100755
--- a/configure
+++ b/configure
@@ -3431,7 +3431,7 @@ test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
 
-ac_config_files="$ac_config_files Makefile art/Makefile art/splash/Makefile art/usplash/Makefile"
+ac_config_files="$ac_config_files Makefile art/Makefile art/splash/Makefile art/splashy/Makefile art/usplash/Makefile"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -4022,6 +4022,7 @@ do
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "art/Makefile") CONFIG_FILES="$CONFIG_FILES art/Makefile" ;;
     "art/splash/Makefile") CONFIG_FILES="$CONFIG_FILES art/splash/Makefile" ;;
+    "art/splashy/Makefile") CONFIG_FILES="$CONFIG_FILES art/splashy/Makefile" ;;
     "art/usplash/Makefile") CONFIG_FILES="$CONFIG_FILES art/usplash/Makefile" ;;
 
   *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
diff --git a/debian/changelog b/debian/changelog
index bff3919..36b2ae8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ debian-edu-artwork (0.0.2) UNRELEASED; urgency=low
   * Add option to dh_makeshlibs call to avoid useless
     code for ldconfig call in maintainer scripts
 
+  [ Petter Reinholdtsen ]
+  * Install splash image as /boot/grub/splash.xpm.gz, to make it available
+    for grub.
+
  -- Petter Reinholdtsen <pere at debian.org>  Fri,  4 Aug 2006 16:19:43 +0200
 
 debian-edu-artwork (0.0.1) unstable; urgency=low
diff --git a/debian/debian-edu-artwork.install b/debian/debian-edu-artwork.install
index e1ee9cf..92e080a 100644
--- a/debian/debian-edu-artwork.install
+++ b/debian/debian-edu-artwork.install
@@ -1 +1,2 @@
 debian/tmp/usr/share
+debian/tmp/boot

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