[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.dfsg-1-215-g73a2a5d

[Jonas Smedegaard]

The following commit has been merged in the master branch:
commit 18ef38a4c0c777dab023639db57e437fc0635a6d
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Mar 24 21:32:55 2010 +0100

    Fix fail on error uudecoding Firefox icon, add comment, and keep its cleanup close.

diff --git a/debian/rules b/debian/rules
index 289a056..da5e1f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -42,8 +42,11 @@ DEB_ANT_BUILDFILE = debian/build.xml
 DEB_ANT_BUILD_TARGET = bin-jar
 DEB_ANT_ARGS = -Dpackage=awgraphapplet -Dversion=$(DEB_NOEPOCH_VERSION)
 
+# "Binarize" (and cleanup) Debian-shipped non-trademarked Firefox icon
 pre-build::
-	(cd debian/icons && uudecode firefox.png.uu)
+	uudecode -o debian/icons/firefox.png debian/icons/firefox.png.uu
+clean::
+	rm -f debian/icons/firefox.png
 
 common-configure-indep::
 	# Use perl rather than a diff here, to make sure all relevant
@@ -70,7 +73,7 @@ common-configure-indep::
 	< wwwroot/cgi-bin/awstats.model.conf > debian/awstats.conf
 
 clean::
-	rm -f debian/awstats.conf debian/icons/firefox.png wwwroot/classes/awgraphapplet?*.jar
+	rm -f debian/awstats.conf wwwroot/classes/awgraphapplet?*.jar
 
 # Install java applet
 # TODO: use DEB_DH_INSTALL_ARGS_awstats when some day implemented in CDBS

-- 
awstats Debian packaging