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

    Merge and optimize find tidying routines.

diff --git a/debian/rules b/debian/rules
index f434369..289a056 100755
--- a/debian/rules
+++ b/debian/rules
@@ -72,29 +72,22 @@ common-configure-indep::
 clean::
 	rm -f debian/awstats.conf debian/icons/firefox.png wwwroot/classes/awgraphapplet?*.jar
 
-# Remove badly coded PDF
-binary-post-install/awstats::
-	find $(DEB_DESTDIR) -type f -name *.pdf | xargs -r rm
-
 # Install 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/
 
-# Debian stores the GPL at one single spot
+# Remove badly coded PDF and superfluous GPL license texts
 binary-post-install/awstats::
-	find $(DEB_DESTDIR) -name COPYING.TXT -o -name LICENSE.TXT | xargs -r rm
+	find $(DEB_DESTDIR) -type f \
+		\( -name '*.pdf' -o -name -name COPYING.TXT -o -name LICENSE.TXT \) \
+		-exec rm '{}' +
 
 # Set scripts executable - and unset other files
 binary-fixup/awstats::
-	find $(DEB_DESTDIR)/usr/share/awstats -type f | xargs -r chmod -x
+	find $(DEB_DESTDIR)/usr/share/awstats -type f  -exec chmod -x '{}' +
 	find $(DEB_DESTDIR)/usr/share/awstats/tools $(DEB_DESTDIR)/usr/share/doc/awstats/examples \
-		-name *.pl -o -name *.sh | xargs -r chmod +x
-
-# Set example scripts executable - and unset for remaining example files
-binary-fixup/awstats::
-	chmod -x,+X -R $(DEB_DESTDIR)/usr/share/doc/awstats/examples/
-	chmod +x $(addprefix $(DEB_DESTDIR)/usr/share/doc/awstats/examples/,$(notdir $(awstats_example_scripts)))
+		-name '*.pl' -o -name '*.sh' -exec chmod +x '{}' +
 
 # Needed (often/sometimes) at runtime
 CDBS_RECOMMENDS = libnet-xwhois-perl

-- 
awstats Debian packaging