[debian-edu-commits] debian-edu/ 282/437: Clean art/splash/ from magic needed for GRUB legacy. It is not needed for GRUB2. Remove imagemagick from builddeps.
Mike Gabriel
sunweaver at debian.org
Sun Mar 2 23:49:43 UTC 2014
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 34e40bcbfe74868d6493d81585ce48112f7e86bc
Author: Andreas B. Mundt <andi.mundt at web.de>
Date: Sat Jun 18 10:27:37 2011 +0000
Clean art/splash/ from magic needed for GRUB legacy. It is not needed
for GRUB2. Remove imagemagick from builddeps.
---
art/splash/Makefile.am | 38 +-----------------
art/splash/Makefile.in | 81 +++++++--------------------------------
debian/changelog | 2 +
debian/control | 2 +-
debian/debian-edu-artwork.install | 1 -
5 files changed, 18 insertions(+), 106 deletions(-)
diff --git a/art/splash/Makefile.am b/art/splash/Makefile.am
index 224295c..8e45df1 100644
--- a/art/splash/Makefile.am
+++ b/art/splash/Makefile.am
@@ -1,51 +1,17 @@
SPLASH = debian-edu-splash.png debian-edu-splash-live.png
-RLES = $(SPLASH:.png=.rle)
-
splashdir = $(datadir)/pixmaps/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/
-#BUILT_SOURCES = $(XPMGZS) $(RLES)
-
-SUFFIXES = .png .rle .xpm .xpm.gz
-
-install-data-local: $(XPMGZS)
+install-data-local:
$(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.
-# Not sure how to enable this properly, to avoid conflicts with other grub image packages.
-# This do not work properly because of #477791.
- ln -s splashimages/splash-debian-edu.xpm.gz $(DESTDIR)$(grubdir)/splash.xpm.gz
-
-# Cpnvert grub image from grub2 image. Need to be XPM, 14 colors 8 bit RGB, 640x480 pixels.
-# Compression is optional but speed up the boot with modern machines.
-splash-debian-edu.xpm:
- convert -resize 640x480 -colors 14 -background black -depth 8 \
- background-grub2.png splash-debian-edu.xpm
-splash-debian-edu.xpm.gz: splash-debian-edu.xpm
- gzip -9 < $^ > $@
-
debian-edu-splash-grub.png:
cp background-grub2.png $@
-.png.rle:
- pngtopnm < $^ | ppmquant 16 | ppmtolss16 "#ffffff=7" "#000000=0" > $@
-.png.xpm:
- convert $^ $@
-.xpm.xpm.gz:
- gzip -9 < $^ > $@
-
EXTRA_DIST = $(splash_DATA)
-CLEANFILES = $(RLES) $(XPMS) $(XPMGZS) debian-edu-splash-grub.png
+CLEANFILES = debian-edu-splash-grub.png
diff --git a/art/splash/Makefile.in b/art/splash/Makefile.in
index f47169c..31d24d2 100644
--- a/art/splash/Makefile.in
+++ b/art/splash/Makefile.in
@@ -64,9 +64,8 @@ am__nobase_list = $(am__nobase_strip_setup); \
am__base_list = \
sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
-am__installdirs = "$(DESTDIR)$(grubsplashdir)" \
- "$(DESTDIR)$(splashdir)"
-DATA = $(grubsplash_DATA) $(splash_DATA)
+am__installdirs = "$(DESTDIR)$(splashdir)"
+DATA = $(splash_DATA)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
AMTAR = @AMTAR@
@@ -156,24 +155,14 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
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) 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/
-
-#BUILT_SOURCES = $(XPMGZS) $(RLES)
-SUFFIXES = .png .rle .xpm .xpm.gz
EXTRA_DIST = $(splash_DATA)
-CLEANFILES = $(RLES) $(XPMS) $(XPMGZS) debian-edu-splash-grub.png
+CLEANFILES = debian-edu-splash-grub.png
all: all-am
.SUFFIXES:
-.SUFFIXES: .png .rle .xpm .xpm.gz
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@for dep in $?; do \
case '$(am__configure_deps)' in \
@@ -204,26 +193,6 @@ $(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
$(am__aclocal_m4_deps):
-install-grubsplashDATA: $(grubsplash_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(grubsplashdir)" || $(MKDIR_P) "$(DESTDIR)$(grubsplashdir)"
- @list='$(grubsplash_DATA)'; test -n "$(grubsplashdir)" || list=; \
- for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- echo "$$d$$p"; \
- done | $(am__base_list) | \
- while read files; do \
- echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(grubsplashdir)'"; \
- $(INSTALL_DATA) $$files "$(DESTDIR)$(grubsplashdir)" || exit $$?; \
- done
-
-uninstall-grubsplashDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(grubsplash_DATA)'; test -n "$(grubsplashdir)" || list=; \
- files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
- test -n "$$files" || exit 0; \
- echo " ( cd '$(DESTDIR)$(grubsplashdir)' && rm -f" $$files ")"; \
- cd "$(DESTDIR)$(grubsplashdir)" && rm -f $$files
install-splashDATA: $(splash_DATA)
@$(NORMAL_INSTALL)
test -z "$(splashdir)" || $(MKDIR_P) "$(DESTDIR)$(splashdir)"
@@ -285,7 +254,7 @@ check-am: all-am
check: check-am
all-am: Makefile $(DATA)
installdirs:
- for dir in "$(DESTDIR)$(grubsplashdir)" "$(DESTDIR)$(splashdir)"; do \
+ for dir in "$(DESTDIR)$(splashdir)"; do \
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
@@ -334,8 +303,7 @@ info: info-am
info-am:
-install-data-am: install-data-local install-grubsplashDATA \
- install-splashDATA
+install-data-am: install-data-local install-splashDATA
install-dvi: install-dvi-am
@@ -379,7 +347,7 @@ ps: ps-am
ps-am:
-uninstall-am: uninstall-grubsplashDATA uninstall-splashDATA
+uninstall-am: uninstall-splashDATA
.MAKE: install-am install-strip
@@ -387,44 +355,21 @@ uninstall-am: uninstall-grubsplashDATA uninstall-splashDATA
distclean-generic distdir dvi dvi-am html html-am info info-am \
install install-am install-data install-data-am \
install-data-local install-dvi install-dvi-am install-exec \
- install-exec-am install-grubsplashDATA install-html \
- install-html-am install-info install-info-am install-man \
- install-pdf install-pdf-am install-ps install-ps-am \
- install-splashDATA install-strip installcheck installcheck-am \
- installdirs maintainer-clean maintainer-clean-generic \
- mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
- uninstall-am uninstall-grubsplashDATA uninstall-splashDATA
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-splashDATA install-strip \
+ installcheck installcheck-am installdirs maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
+ pdf-am ps ps-am uninstall uninstall-am uninstall-splashDATA
-install-data-local: $(XPMGZS)
+install-data-local:
$(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.
-# Not sure how to enable this properly, to avoid conflicts with other grub image packages.
-# This do not work properly because of #477791.
- ln -s splashimages/splash-debian-edu.xpm.gz $(DESTDIR)$(grubdir)/splash.xpm.gz
-
-# Cpnvert grub image from grub2 image. Need to be XPM, 14 colors 8 bit RGB, 640x480 pixels.
-# Compression is optional but speed up the boot with modern machines.
-splash-debian-edu.xpm:
- convert -resize 640x480 -colors 14 -background black -depth 8 \
- background-grub2.png splash-debian-edu.xpm
-splash-debian-edu.xpm.gz: splash-debian-edu.xpm
- gzip -9 < $^ > $@
-
debian-edu-splash-grub.png:
cp background-grub2.png $@
-.png.rle:
- pngtopnm < $^ | ppmquant 16 | ppmtolss16 "#ffffff=7" "#000000=0" > $@
-.png.xpm:
- convert $^ $@
-.xpm.xpm.gz:
- gzip -9 < $^ > $@
-
# 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/debian/changelog b/debian/changelog
index a8c44a5..83243dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,8 @@ debian-edu-artwork (0.0.32-3) UNRELEASED; urgency=low
* Use the work of Christoph Muetze as current theme.
* Add Christoph Muetze to AUTHORS and mention his work in
debian/copyright.
+ * Clean art/splash/ from magic needed for GRUB legacy. It is not needed
+ for GRUB2. Remove imagemagick from builddeps.
-- Petter Reinholdtsen <pere at debian.org> Mon, 06 Dec 2010 11:12:20 +0100
diff --git a/debian/control b/debian/control
index a59bd58..e5e7ad6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
Priority: optional
Maintainer: Debian Edu developers <debian-edu at lists.debian.org>
Uploaders: Petter Reinholdtsen <pere at debian.org>, Steffen Joeris <white at debian.org>, Holger Levsen <holger at debian.org>, Morten Werner Forsbring <werner at debian.org>, Vagrant Cascadian <vagrant at debian.org>, Jonas Smedegaard <dr at jones.dk>, Andreas B. Mundt <andi.mundt at web.de>
-Build-Depends: debhelper (>= 7), cdbs, libbogl-dev, imagemagick, librsvg2-bin
+Build-Depends: debhelper (>= 7), cdbs, libbogl-dev, librsvg2-bin
Standards-Version: 3.9.1
XS-DM-Upload-Allowed: yes
diff --git a/debian/debian-edu-artwork.install b/debian/debian-edu-artwork.install
index 0edd167..bf0ea0c 100644
--- a/debian/debian-edu-artwork.install
+++ b/debian/debian-edu-artwork.install
@@ -1,3 +1,2 @@
-debian/tmp/boot/grub
debian/tmp/etc
debian/tmp/usr/share
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git
More information about the debian-edu-commits
mailing list