[debian-edu-commits] debian-edu/ 161/437: Disable building of .rle and .xpm.gz, as these are not installed. This removes the build depend need for syslinux and netpbm. (Closes: #441909)

[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 5470595e336f9a84f282c394b2b6f9852515d21f
Author: Petter Reinholdtsen <pere at hungry.com>
Date:   Thu Sep 13 07:38:10 2007 +0000

    Disable building of .rle and .xpm.gz, as these are not installed.
    This removes the build depend need for syslinux and
    netpbm. (Closes: #441909)
---
 art/splash/Makefile.am |  2 +-
 art/splash/Makefile.in | 13 +++++--------
 debian/changelog       |  6 +++++-
 debian/control         |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/art/splash/Makefile.am b/art/splash/Makefile.am
index 412620b..4f21e41 100644
--- a/art/splash/Makefile.am
+++ b/art/splash/Makefile.am
@@ -11,7 +11,7 @@ splash_DATA = $(SPLASH)
 grubdir       = /boot/grub
 grubsplashdir = $(grubdir)/splashimages
 
-BUILT_SOURCES = $(XPMGZS) $(RLES)
+#BUILT_SOURCES = $(XPMGZS) $(RLES)
 
 install-data-local: $(XPMGZS)
 	$(mkinstalldirs) $(DESTDIR)$(splashdir)
diff --git a/art/splash/Makefile.in b/art/splash/Makefile.in
index ac80d83..8f66818 100644
--- a/art/splash/Makefile.in
+++ b/art/splash/Makefile.in
@@ -143,7 +143,6 @@ splashdir = $(datadir)/pixmaps/splash
 splash_DATA = $(SPLASH) 
 grubdir = /boot/grub
 grubsplashdir = $(grubdir)/splashimages
-BUILT_SOURCES = $(XPMGZS) $(RLES)
 
 # Make it available as a grub splash image, detected and used by update-grub
 # This do not quite work yes.
@@ -155,8 +154,7 @@ BUILT_SOURCES = $(XPMGZS) $(RLES)
 SUFFIXES = .png .rle .xpm .xpm.gz
 EXTRA_DIST = $(splash_DATA)
 CLEANFILES = $(RLES) $(XPMS) $(XPMGZS)
-all: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) all-am
+all: all-am
 
 .SUFFIXES:
 .SUFFIXES: .png .rle .xpm .xpm.gz
@@ -242,15 +240,13 @@ distdir: $(DISTFILES)
 	  fi; \
 	done
 check-am: all-am
-check: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) check-am
+check: check-am
 all-am: Makefile $(DATA)
 installdirs:
 	for dir in "$(DESTDIR)$(splashdir)"; do \
 	  test -z "$$dir" || $(mkdir_p) "$$dir"; \
 	done
-install: $(BUILT_SOURCES)
-	$(MAKE) $(AM_MAKEFLAGS) install-am
+install: install-am
 install-exec: install-exec-am
 install-data: install-data-am
 uninstall: uninstall-am
@@ -275,7 +271,6 @@ distclean-generic:
 maintainer-clean-generic:
 	@echo "This command is intended for maintainers to use"
 	@echo "it deletes files that may require special tools to rebuild."
-	-test -z "$(BUILT_SOURCES)" || rm -f $(BUILT_SOURCES)
 clean: clean-am
 
 clean-am: clean-generic mostlyclean-am
@@ -333,6 +328,8 @@ uninstall-am: uninstall-info-am uninstall-splashDATA
 	uninstall-splashDATA
 
 
+#BUILT_SOURCES = $(XPMGZS) $(RLES)
+
 install-data-local: $(XPMGZS)
 	$(mkinstalldirs) $(DESTDIR)$(splashdir)
 
diff --git a/debian/changelog b/debian/changelog
index dbf3a65..b08a887 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,11 @@
 debian-edu-artwork (0.0.23) terra; urgency=low
 
   * UNRELEASED
-  * Build-depend on netpbm for pngtopnm and ppmquant (Closes: #441909)
+
+  [ Petter Reinholdtsen ]
+  * Disable building of .rle and .xpm.gz, as these are not installed.
+    This removes the build depend need for syslinux and
+    netpbm. (Closes: #441909)
 
  -- Petter Reinholdtsen <pere at debian.org>  Sat,  8 Sep 2007 10:49:34 +0200
 
diff --git a/debian/control b/debian/control
index 466fb03..b46e47e 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>
-Build-Depends: debhelper (>= 4), cdbs, libbogl-dev, imagemagick, netpbm, syslinux
+Build-Depends: debhelper (>= 4), cdbs, libbogl-dev, imagemagick
 Standards-Version: 3.7.2
 
 Package: debian-edu-artwork

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