[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 5e6a81ec010e62430afdaa0322f145844494c072
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Wed Mar 24 21:46:23 2010 +0100

    Use multiple -e options in perl-in-shell-in-make rule, to not need surrounding space chomped.

diff --git a/debian/rules b/debian/rules
index 42d55c9..daa3c3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -56,22 +56,22 @@ common-configure-indep::
 # Perl in shell in make requires extra care:
 #  * Single-quoting ('...') protects against shell expansion
 #  * Double-dollar ($$) expands to plain dollar ($) in make
-	perl -wpe \
-	's,^(LogFile\s*=\s*).*,$$1"/var/log/apache2/access.log",;'\
-	's,^(DirData\s*=\s*).*,$$1"/var/lib/awstats",;'\
-	's,^(LogFormat\s*=\s*).*,$${1}4,;'\
-	's,^(DNSLookup\s*=\s*).*,$${1}1,;'\
-	's,^(DirIcons\s*=\s*).*,$$1"/awstats-icon",;'\
-	's,^(HostAliases\s*=\s*).*,$$1"localhost 127.0.0.1",;'\
-	's,^(DirLang\s*=\s*).*,$$1"/usr/share/awstats/lang",;'\
-	's,^#(LoadPlugin\s*=\s*"hashfiles"),$$1,;'\
-	's,^#(Include\s*)"",$$1"/etc/awstats/awstats.conf.local",;'\
-	's,^(#LoadPlugin\s*=\s*"geoip\s*GEOIP_STANDARD\s*).*,$$1/usr/share/GeoIP/GeoIP.dat",;'\
-	's,^(#LoadPlugin\s*=\s*"geoip_region_maxmind\s*GEOIP_STANDARD\s*).*,$$1/usr/share/GeoIP/GeoIPRegion.dat",;'\
-	's,^(#LoadPlugin\s*=\s*"geoip_city_maxmind\s*GEOIP_STANDARD\s*).*,$$1/usr/share/GeoIP/GeoIPCity.dat",;'\
-	'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
+	perl -wp \
+		-e 's,^(LogFile\s*=\s*).*,$$1"/var/log/apache2/access.log",;' \
+		-e 's,^(DirData\s*=\s*).*,$$1"/var/lib/awstats",;' \
+		-e 's,^(LogFormat\s*=\s*).*,$${1}4,;' \
+		-e 's,^(DNSLookup\s*=\s*).*,$${1}1,;' \
+		-e 's,^(DirIcons\s*=\s*).*,$$1"/awstats-icon",;' \
+		-e 's,^(HostAliases\s*=\s*).*,$$1"localhost 127.0.0.1",;' \
+		-e 's,^(DirLang\s*=\s*).*,$$1"/usr/share/awstats/lang",;' \
+		-e 's,^#(LoadPlugin\s*=\s*"hashfiles"),$$1,;' \
+		-e 's,^#(Include\s*)"",$$1"/etc/awstats/awstats.conf.local",;' \
+		-e 's,^(#LoadPlugin\s*=\s*"geoip\s*GEOIP_STANDARD\s*).*,$$1/usr/share/GeoIP/GeoIP.dat",;' \
+		-e 's,^(#LoadPlugin\s*=\s*"geoip_region_maxmind\s*GEOIP_STANDARD\s*).*,$$1/usr/share/GeoIP/GeoIPRegion.dat",;' \
+		-e 's,^(#LoadPlugin\s*=\s*"geoip_city_maxmind\s*GEOIP_STANDARD\s*).*,$$1/usr/share/GeoIP/GeoIPCity.dat",;' \
+		-e 's,^(#LoadPlugin\s*=\s*"geoip_isp_maxmind\s*GEOIP_STANDARD\s*).*,$$1/usr/share/GeoIP/GeoIPISP.dat",;' \
+		-e '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
 

-- 
awstats Debian packaging