[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 2d599094a44dcb10cfbb64a1e48c8a99090091a8
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Mar 24 21:40:26 2010 +0100

    Add some comments to rules, and keep related cleanup close.

diff --git a/debian/rules b/debian/rules
index da5e1f8..42d55c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -48,6 +48,7 @@ pre-build::
 clean::
 	rm -f debian/icons/firefox.png
 
+# Adjust for Debian (and cleanup) main config file
 common-configure-indep::
 	# Use perl rather than a diff here, to make sure all relevant
 	# options are checked (upstream defaults have moved around in
@@ -71,14 +72,15 @@ common-configure-indep::
 	's,^(#LoadPlugin\s*=\s*"geoip_isp_maxmind\s*GEOIP_STANDARD\s*).*,$$1/usr/share/GeoIP/GeoIPISP.dat",;'\
 	's,^(#LoadPlugin\s*=\s*"geoip_org_maxmind\s*GEOIP_STANDARD\s*).*,$$1/usr/share/GeoIP/GeoIPOrg.dat",;'\
 	< wwwroot/cgi-bin/awstats.model.conf > debian/awstats.conf
-
 clean::
-	rm -f debian/awstats.conf wwwroot/classes/awgraphapplet?*.jar
+	rm -f debian/awstats.conf
 
-# Install java applet
+# Install (and cleanup) java applet
 # TODO: use DEB_DH_INSTALL_ARGS_awstats when some day implemented in CDBS
 DEB_DH_LINK_awstats = usr/share/java/awstats/awgraphapplet$(DEB_NOEPOCH_VERSION).jar usr/share/java/awstats/awgraphapplet.jar
 binary-install/awstats:: DEB_DH_INSTALL_ARGS = wwwroot/classes/awgraphapplet$(DEB_NOEPOCH_VERSION).jar usr/share/java/awstats/
+clean::
+	rm -f wwwroot/classes/awgraphapplet?*.jar
 
 # Remove badly coded PDF and superfluous GPL license texts
 binary-post-install/awstats::

-- 
awstats Debian packaging