[Pkg-awstats-commits] [SCM] awstats Debian packaging branch, master, updated. debian/6.9.dfsg-1-215-g73a2a5d
Jonas Smedegaard
dr at jones.dk
Thu Mar 25 00:26:05 UTC 2010
The following commit has been merged in the master branch:
commit 73a2a5d1ef4f4818d4ea3387cbb7f4f4618e7b7f
Merge: 5e6a81ec010e62430afdaa0322f145844494c072 6386e7b58582d19f9a0de1bed79fa8ed4e7e762b
Author: Jonas Smedegaard <dr at jones.dk>
Date: Thu Mar 25 01:25:28 2010 +0100
Merge branch 'master' of git.debian.org:/git/collab-maint/awstats
Conflicts:
debian/rules
diff --combined debian/rules
index daa3c3a,b0b3557..3e8dec7
--- a/debian/rules
+++ b/debian/rules
@@@ -1,6 -1,6 +1,6 @@@
#!/usr/bin/make -f
# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2003-2009 Jonas Smedegaard <dr at jones.dk>
+# Copyright © 2003-2010 Jonas Smedegaard <dr at jones.dk>
# Description: Main Debian packaging script for AWStats
#
# This program is free software; you can redistribute it and/or
@@@ -18,10 -18,17 +18,10 @@@
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
# 02111-1307 USA.
-ifneq (,$(DEB_MAINTAINER_MODE))
- # Enable stuff not policy compliant (eg. unsuitable for build daemons)
- DEB_COPYRIGHT_CHECK_STRICT = yes
- DEB_AUTO_UPDATE_DEBIAN_CONTROL = yes
-endif
+include /usr/share/cdbs/1/rules/upstream-tarball.mk
+include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/cdbs/1/class/ant.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
-include debian/cdbs/1/rules/buildinfo.mk
-include debian/cdbs/1/rules/copyright-check.mk
-include debian/cdbs/1/rules/upstream-tarball.mk
DEB_UPSTREAM_URL = http://prdownloads.sourceforge.net/awstats
DEB_UPSTREAM_TARBALL_BASENAME_MANGLE = s/(-6\.9)\.(\d)/$$1$$2/
@@@ -42,13 -49,9 +42,13 @@@ DEB_ANT_BUILDFILE = debian/build.xm
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
+# 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
@@@ -56,50 -59,63 +56,50 @@@
# 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 debian/icons/firefox.png wwwroot/classes/awgraphapplet?*.jar
+ rm -f debian/awstats.conf
-# Remove badly coded PDF, and .cvsignore
-binary-post-install/awstats::
- find $(DEB_DESTDIR) -type f -name *.pdf | xargs -r rm
- find $(DEB_DESTDIR) -type f -name .cvsignore | xargs -r rm
-
-# 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
-# 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)))
-
-binary-predep/awstats::
- dh_perl -p$(DEB_CURPACKAGE)
+ -name '*.pl' -o -name '*.sh' -exec chmod +x '{}' +
# Needed (often/sometimes) at runtime
- CDBS_RECOMMENDS = libnet-xwhois-perl
- CDBS_SUGGESTS = apache2 | httpd, libnet-dns-perl, libnet-ip-perl, libgeo-ipfree-perl
+ CDBS_RECOMMENDS := libnet-xwhois-perl
+ CDBS_SUGGESTS := apache2 | httpd, libnet-dns-perl, libnet-ip-perl, libgeo-ipfree-perl, liburi-perl
# Needed by upstream build process
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), ant, default-jdk
+CDBS_BUILD_DEPENDS += , ant, default-jdk
# Needed for our packaging
-CDBS_BUILD_DEPENDS := $(CDBS_BUILD_DEPENDS), sharutils
-
-# Resolve, cleanup and apply CDBS-declared dependencies
-include debian/cdbs/1/rules/package-relations.mk
+CDBS_BUILD_DEPENDS += , sharutils
--
awstats Debian packaging
More information about the Pkg-awstats-commits
mailing list