[debian-edu-commits] debian-edu/ 01/01: Remove art-(joy|lines)/splash/debian-edu-(joy|lines)-splash-live.png links and add those targets to those Makefile.am's. This fixes an unreported FTBFS with pbuilder (but not with debuild), which is also present in at least 0.47.

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-artwork.

commit dd5d3b46dbb651a145287b026067a10e2816aabf
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Sep 30 15:12:33 2014 +0200

    Remove art-(joy|lines)/splash/debian-edu-(joy|lines)-splash-live.png links and
    add those targets to those Makefile.am's.  This fixes an unreported FTBFS with
    pbuilder (but not with debuild), which is also present in at least 0.47.
---
 art-joy/splash/Makefile.am                        | 3 +++
 art-joy/splash/debian-edu-joy-splash-live.png     | 1 -
 art-lines/splash/Makefile.am                      | 3 +++
 art-lines/splash/debian-edu-lines-splash-live.png | 1 -
 debian/changelog                                  | 7 +++++++
 5 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/art-joy/splash/Makefile.am b/art-joy/splash/Makefile.am
index 34818c9..0aa9769 100644
--- a/art-joy/splash/Makefile.am
+++ b/art-joy/splash/Makefile.am
@@ -12,6 +12,9 @@ debian-edu-joy-splash.png: debian-edu-joy-splash.svg
 	optipng -o4 -i0 -fix $@
 	advpng -z4 $@
 
+debian-edu-joy-splash-live.png: debian-edu-joy-splash.png
+	cp $^ $@
+
 debian-edu-joy-splash-grub.png: debian-edu-joy-splash.png
 	cp $^ $@
 
diff --git a/art-joy/splash/debian-edu-joy-splash-live.png b/art-joy/splash/debian-edu-joy-splash-live.png
deleted file mode 120000
index 70e2d60..0000000
--- a/art-joy/splash/debian-edu-joy-splash-live.png
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu-joy-splash.png
\ No newline at end of file
diff --git a/art-lines/splash/Makefile.am b/art-lines/splash/Makefile.am
index 326df5e..1dfc428 100644
--- a/art-lines/splash/Makefile.am
+++ b/art-lines/splash/Makefile.am
@@ -16,6 +16,9 @@ debian-edu-lines-splash.png: debian-edu-lines-splash.svg
 debian-edu-lines-splash-grub.png: debian-edu-lines-splash.png
 	cp $^ $@
 
+debian-edu-lines-splash-live.png: debian-edu-lines-splash.png
+	cp $^ $@
+
 EXTRA_DIST = $(splash_DATA) debian-edu-lines-splash.svg
 
 CLEANFILES = debian-edu-lines-splash-grub.png debian-edu-lines-splash.png
diff --git a/art-lines/splash/debian-edu-lines-splash-live.png b/art-lines/splash/debian-edu-lines-splash-live.png
deleted file mode 120000
index 150df12..0000000
--- a/art-lines/splash/debian-edu-lines-splash-live.png
+++ /dev/null
@@ -1 +0,0 @@
-debian-edu-lines-splash.png
\ No newline at end of file
diff --git a/debian/changelog b/debian/changelog
index 867603e..39aab4b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 debian-edu-artwork (0.48) UNRELEASED; urgency=high
 
+  [ Wolfgang Schweer ]
   * Add new package debian-edu-artwork-lines: 
     - Add art-lines, originally as a copy of art-joy.
     - Add directory playground/jessie with svg files for theme 'lines'
@@ -45,6 +46,12 @@ debian-edu-artwork (0.48) UNRELEASED; urgency=high
     - Adjust debian/update-debian-edu-artwork-lines.
   * Add myself to Uploaders.
 
+  [ Holger Levsen ]
+  * Remove art-(joy|lines)/splash/debian-edu-(joy|lines)-splash-live.png links
+    and add those targets to those Makefile.am's.  This fixes an unreported
+    FTBFS with pbuilder (but not with debuild), which is also present in at
+    least 0.47. 
+
  -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 24 Sep 2014 18:43:30 +0200
 
 debian-edu-artwork (0.47) unstable; urgency=medium

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