[debian-edu-commits] r81981 - in branches/wheezy/debian-edu-artwork: art/splash debian

[pere at alioth.debian.org]

Author: pere
Date: 2013-08-08 20:24:04 +0000 (Thu, 08 Aug 2013)
New Revision: 81981

Removed:
   branches/wheezy/debian-edu-artwork/art/splash/debian-edu-splash.png
Modified:
   branches/wheezy/debian-edu-artwork/art/splash/Makefile.am
   branches/wheezy/debian-edu-artwork/debian/changelog
   branches/wheezy/debian-edu-artwork/debian/control
Log:
Build grub image from SVG using convert from imagemagick, optipng,
advancecomp.  Add these as build dependencies.

Modified: branches/wheezy/debian-edu-artwork/art/splash/Makefile.am
===================================================================
--- branches/wheezy/debian-edu-artwork/art/splash/Makefile.am	2013-08-08 20:08:41 UTC (rev 81980)
+++ branches/wheezy/debian-edu-artwork/art/splash/Makefile.am	2013-08-08 20:24:04 UTC (rev 81981)
@@ -5,14 +5,14 @@
 
 grub2splashdir= /usr/share/desktop-base/
 
-# Draft build rule for the PNG using the SVG as the source
-#debian-edu-splash.png: debian-edu-splash.svg
-#	convert $^ $@
-#	optipng -o4 -i0 -fix $@
-#	advpng -z4 $@
+# Build rule for the PNG using the SVG as the source
+debian-edu-splash.png: debian-edu-splash.svg
+	convert $^ $@
+	optipng -o4 -i0 -fix $@
+	advpng -z4 $@
 
-debian-edu-splash-grub.png:
-	cp background-grub2.png $@
+debian-edu-splash-grub.png: debian-edu-splash.png
+	cp $^ $@
 
 EXTRA_DIST = $(splash_DATA)
 

Deleted: branches/wheezy/debian-edu-artwork/art/splash/debian-edu-splash.png
===================================================================
(Binary files differ)

Modified: branches/wheezy/debian-edu-artwork/debian/changelog
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/changelog	2013-08-08 20:08:41 UTC (rev 81980)
+++ branches/wheezy/debian-edu-artwork/debian/changelog	2013-08-08 20:24:04 UTC (rev 81981)
@@ -1,7 +1,12 @@
 debian-edu-artwork (0.44-1) UNRELEASED; urgency=low
 
+  [ Wolfgang Schweer ]
   * Fix grub image (colour space: indexed -> RGB; density 72x72).
 
+  [ Petter Reinholdtsen ]
+  * Build grub image from SVG using convert from imagemagick, optipng,
+    advancecomp.  Add these as build dependencies.
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Thu, 08 Aug 2013 14:38:31 +0200
 
 debian-edu-artwork (0.43-1) unstable; urgency=low

Modified: branches/wheezy/debian-edu-artwork/debian/control
===================================================================
--- branches/wheezy/debian-edu-artwork/debian/control	2013-08-08 20:08:41 UTC (rev 81980)
+++ branches/wheezy/debian-edu-artwork/debian/control	2013-08-08 20:24:04 UTC (rev 81981)
@@ -3,7 +3,7 @@
 Priority: extra
 Maintainer: Debian Edu developers <debian-edu at lists.debian.org>
 Uploaders: Petter Reinholdtsen <pere at debian.org>, Holger Levsen <holger at debian.org>
-Build-Depends: debhelper (>= 8.1.0~), cdbs, rdfind, symlinks
+Build-Depends: debhelper (>= 8.1.0~), cdbs, rdfind, symlinks, imagemagick, optipng, advancecomp
 Standards-Version: 3.9.4
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-edu/trunk/src/debian-edu-artwork/
 Vcs-Svn: svn://anonscm.debian.org/debian-edu/trunk/src/debian-edu-artwork/