[debian-edu-commits] debian-edu/ 04/05: Use inkscape for doing the initial SVG -> PNG conversion.

Mike Gabriel sunweaver at debian.org
Tue Oct 7 11:04:12 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 83961e125336b43416ee56a05f91ed2367867c28
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Tue Oct 7 12:48:10 2014 +0200

    Use inkscape for doing the initial SVG -> PNG conversion.
---
 art-joy/splash/Makefile.am                 |  3 ++-
 art-lines/g-i/Makefile.am                  |  2 +-
 art-lines/kde/Makefile.am                  | 12 ++++++------
 art-lines/ksplash-bg_1280x1024/Makefile.am |  2 +-
 art-lines/ksplash-bg_1920x1080/Makefile.am |  2 +-
 art-lines/ksplash-bg_1920x1200/Makefile.am |  2 +-
 art-lines/ksplash-bg_2560x1080/Makefile.am |  2 +-
 art-lines/ksplash-theme/Makefile.am        |  2 +-
 art-lines/splash/Makefile.am               |  4 ++--
 debian/changelog                           |  3 +++
 10 files changed, 19 insertions(+), 15 deletions(-)

diff --git a/art-joy/splash/Makefile.am b/art-joy/splash/Makefile.am
index 3f8500e..0c1d644 100644
--- a/art-joy/splash/Makefile.am
+++ b/art-joy/splash/Makefile.am
@@ -8,7 +8,8 @@ grub2splashdir= /usr/share/desktop-base/
 
 # Build rule for the PNG using the SVG as the source
 debian-edu-joy-splash.png: debian-edu-joy-splash.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
+	convert $@ -resize 640x -depth 32 $@
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
diff --git a/art-lines/g-i/Makefile.am b/art-lines/g-i/Makefile.am
index addaf21..87ae596 100644
--- a/art-lines/g-i/Makefile.am
+++ b/art-lines/g-i/Makefile.am
@@ -7,7 +7,7 @@ install-data-local:
 
 # Build rule for the PNG using the SVG as the source
 debian-edu-lines-installer-logo.png: debian-edu-lines-installer-logo.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
diff --git a/art-lines/kde/Makefile.am b/art-lines/kde/Makefile.am
index aa66934..d53983d 100644
--- a/art-lines/kde/Makefile.am
+++ b/art-lines/kde/Makefile.am
@@ -29,29 +29,29 @@ eduimg_DATA = $(EDUIMG)
 
 # Build rules for PNG files using the SVG files in playground/jessie as source.
 1280x1024.png: debian-edu-lines-wallpaper_1280x1024.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 1600x1200.png: debian-edu-lines-wallpaper_1600x1200.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 1920x1080.png: debian-edu-lines-wallpaper_1920x1080.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 1920x1200.png: debian-edu-lines-wallpaper_1920x1200.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
 2560x1080.png: debian-edu-lines-wallpaper_2560x1080.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
 screenshot.png: debian-edu-lines-wallpaper_1920x1200.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	convert $@ -resize 400x $@
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
diff --git a/art-lines/ksplash-bg_1280x1024/Makefile.am b/art-lines/ksplash-bg_1280x1024/Makefile.am
index 1871040..47c5cf9 100644
--- a/art-lines/ksplash-bg_1280x1024/Makefile.am
+++ b/art-lines/ksplash-bg_1280x1024/Makefile.am
@@ -8,7 +8,7 @@ install-data-local:
 
 # Build rule for the PNG using the SVG as the source
 background.png: background.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
diff --git a/art-lines/ksplash-bg_1920x1080/Makefile.am b/art-lines/ksplash-bg_1920x1080/Makefile.am
index f0a4303..c30db6e 100644
--- a/art-lines/ksplash-bg_1920x1080/Makefile.am
+++ b/art-lines/ksplash-bg_1920x1080/Makefile.am
@@ -8,7 +8,7 @@ install-data-local:
 
 # Build rule for the PNG using the SVG as the source
 background.png: background.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
diff --git a/art-lines/ksplash-bg_1920x1200/Makefile.am b/art-lines/ksplash-bg_1920x1200/Makefile.am
index f3814ae..dd6cac4 100644
--- a/art-lines/ksplash-bg_1920x1200/Makefile.am
+++ b/art-lines/ksplash-bg_1920x1200/Makefile.am
@@ -8,7 +8,7 @@ install-data-local:
 
 # Build rule for the PNG using the SVG as the source
 background.png: background.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
diff --git a/art-lines/ksplash-bg_2560x1080/Makefile.am b/art-lines/ksplash-bg_2560x1080/Makefile.am
index e92304e..055d28e 100644
--- a/art-lines/ksplash-bg_2560x1080/Makefile.am
+++ b/art-lines/ksplash-bg_2560x1080/Makefile.am
@@ -8,7 +8,7 @@ install-data-local:
 
 # Build rule for the PNG using the SVG as the source
 background.png: background.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
diff --git a/art-lines/ksplash-theme/Makefile.am b/art-lines/ksplash-theme/Makefile.am
index 5fffd45..e9ac14c 100644
--- a/art-lines/ksplash-theme/Makefile.am
+++ b/art-lines/ksplash-theme/Makefile.am
@@ -20,7 +20,7 @@ kdedefault_DATA  = ksplashrc
 
 # Build rule for the PNG using the SVG as the source
 background.png: background.svg
-	convert $^ $@
+	inkscape -z -e $@ $^
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
diff --git a/art-lines/splash/Makefile.am b/art-lines/splash/Makefile.am
index 70f5ea0..4af26e1 100644
--- a/art-lines/splash/Makefile.am
+++ b/art-lines/splash/Makefile.am
@@ -8,8 +8,8 @@ grub2splashdir= /usr/share/desktop-base/
 
 # Build rule for the PNG using the SVG as the source
 debian-edu-lines-splash.png: debian-edu-lines-splash.svg
-	convert $^ $@
-	convert $@ -resize 640x $@
+	inkscape -z -e $@ $^
+	convert $@ -resize 640x -depth 32 $@
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
diff --git a/debian/changelog b/debian/changelog
index 9c3eaec..d6dfc18 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -42,6 +42,9 @@ debian-edu-artwork (0.49-1) UNRELEASED; urgency=medium
   * Hide red swirl logo in GDM3. The Debian Edu background images
     already contain a logo. Remove obsolete code that worked with GDM3 in
     Debian wheezy, but does not work with GDM3 in Debian jessie.
+  * Use inkscape for doing the initial SVG -> PNG conversion. The
+    result of ImageMagick based SVG2PNG conversion is rather poor
+    on the Debian Edu Artwork background images.
   * debian/control:
     + Add Homepage: field. Pointing to a wiki page, we need to put
       some work in.

-- 
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