r8383 - software/thumbnails/debian

[Jon Dowland]

Author: jmtd-guest
Date: 2008-11-11 22:11:41 +0000 (Tue, 11 Nov 2008)
New Revision: 8383

Modified:
   software/thumbnails/debian/changelog
   software/thumbnails/debian/rules
Log:
parallel optipng runs

Modified: software/thumbnails/debian/changelog
===================================================================
--- software/thumbnails/debian/changelog	2008-11-11 22:03:48 UTC (rev 8382)
+++ software/thumbnails/debian/changelog	2008-11-11 22:11:41 UTC (rev 8383)
@@ -1,3 +1,10 @@
+games-thumbnails (20081111) UNRELEASED; urgency=low
+
+  * re-organise the way that optipng is invoked so that
+    it can be parallelized by the -j argument to make.
+
+ -- Jon Dowland <jon at alcopop.org>  Tue, 11 Nov 2008 20:58:31 +0000
+
 games-thumbnails (20080921) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: software/thumbnails/debian/rules
===================================================================
--- software/thumbnails/debian/rules	2008-11-11 22:03:48 UTC (rev 8382)
+++ software/thumbnails/debian/rules	2008-11-11 22:11:41 UTC (rev 8383)
@@ -25,33 +25,35 @@
 	dh_clean -k 
 	dh_installdirs
 
-# Build architecture-independent files here.
-binary-indep: build install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i
-	dh_installdocs -i
-	dh_install -i
+INPUTPNG := $(wildcard *png)
+INPUTJPG := $(wildcard *jpg)
 
+THUMBDEST := debian/games-thumbnails/usr/share/games/thumbnails
+OUTPUTPNG := $(addprefix $(THUMBDEST)/, $(INPUTPNG))
+OUTPUTJPG := $(addprefix $(THUMBDEST)/, $(INPUTJPG))
+
+$(OUTPUTPNG): $(THUMBDEST)/%.png: %.png install
+	cp -p $< $@
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
 # http://lists.debian.org/debian-devel-games/2008/03/msg00123.html
-	cd "$(CURDIR)/debian/games-thumbnails/" && \
-	for i in `find usr/share/games/thumbnails/ -name "*.png"`; do \
-		echo "Optimizing image $$i"; \
-		optipng -q "$$i" ; \
-		advpng -q -z4 "$$i" ; \
-		done
+	optipng -q $@
+	advpng -q -z4 $@
 endif
 
+$(OUTPUTJPG): $(THUMBDEST)/%.jpg: %.jpg install
+	cp -p $< $@
 ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	cd "$(CURDIR)/debian/games-thumbnails/" && \
-	for i in `find usr/share/games/thumbnails/ -name "*.jpeg"` \
-			`find usr/share/games/thumbnails/ -name "*.jpg"` ; do \
-		echo "Optimizing image $$i"; \
-		jpegoptim -q "$$i" ; \
-		done
+	jpegoptim -q $@
 endif
 
+crunchedpics: $(OUTPUTJPG) $(OUTPUTPNG)
+
+# Build architecture-independent files here.
+binary-indep: build install crunchedpics
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs -i
+	dh_installdocs -i
 	dh_link
 	dh_compress -i
 	dh_fixperms -i
@@ -64,4 +66,4 @@
 binary-arch: build install
 
 binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install configure
+.PHONY: build clean binary-indep binary-arch binary install configure crunchedpics