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

[Andreas Henriksson]

The following commit has been merged in the master branch:
commit 096f9ba93f7bcb3f6e89b1a264d9155bd7507e36
Author: Andreas Henriksson <andreas at fatal.se>
Date:   Mon Aug 24 10:23:12 2009 +0200

    Hook up (re)build of awgrapapplet.jar

diff --git a/debian/awstats.install b/debian/awstats.install
index b88f4c7..9319508 100644
--- a/debian/awstats.install
+++ b/debian/awstats.install
@@ -5,6 +5,8 @@ wwwroot/cgi-bin/awstats.pl	usr/lib/cgi-bin/
 wwwroot/cgi-bin/lang/*		usr/share/awstats/lang/
 wwwroot/cgi-bin/lib/*		usr/share/awstats/lib/
 wwwroot/cgi-bin/plugins/*.pm	usr/share/awstats/plugins/
+wwwroot/classes/awgraphapplet.jar usr/share/awstats/classes/
+wwwroot/classes/src/AWGraphApplet.class usr/share/awstats/classes/
 wwwroot/icon/*			usr/share/awstats/icon/
 debian/update.sh	usr/share/awstats/tools/
 tools/awstats_buildstaticpages.pl	usr/share/awstats/tools/
diff --git a/debian/control.in b/debian/control.in
index 3fb0cdb..11bcaf9 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -3,7 +3,7 @@ Section: web
 Priority: optional
 Maintainer: Debian AWStats Team <pkg-awstats-devel at lists.alioth.debian.org>
 Uploaders: Andreas Henriksson <andreas at fatal.se>, Charles Fry <cfry at debian.org>, Jonas Smedegaard <dr at jones.dk>, Sergey B Kirpichev <skirpichev at gmail.com>
-Build-Depends: @cdbs@
+Build-Depends: @cdbs@, openjdk-6-jdk
 Vcs-Git: git://git.debian.org/git/collab-maint/awstats.git
 Vcs-Browser: http://git.debian.org/?p=collab-maint/awstats.git;a=summary
 Standards-Version: 3.8.1
diff --git a/debian/examples/apache.conf b/debian/examples/apache.conf
index cde703f..5ab8120 100644
--- a/debian/examples/apache.conf
+++ b/debian/examples/apache.conf
@@ -21,10 +21,24 @@
 	Allow from all
 </Directory>
 
+# This provides worldwide access to everything below the directory
+# Security concerns: none known
+<Directory /usr/share/awstats/classes>
+	Options None
+	AllowOverride None
+	Order allow,deny
+	Allow from all
+</Directory>
+
+
 # This provides worldwide access to everything in the directory
 # Security concerns: none known
 Alias /awstats-icon/ /usr/share/awstats/icon/
 
+# This provides worldwide access to everything in the directory
+# Security concerns: none known
+Alias /awstatsclasses/ /usr/share/awstats/classes/
+
 # This (hopefully) enables _all_ CGI scripts in the default directory
 # Security concerns: Are you sure _all_ CGI scripts are safe?
 ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
diff --git a/debian/rules b/debian/rules
index b2ba1d9..b05e914 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,6 +44,7 @@ DEB_COMPRESS_EXCLUDE = $(notdir $(awstats_example_scripts)) awstats.ico
 
 pre-build::
 	(cd debian/icons && uudecode firefox.png.uu)
+	(cd wwwroot/classes/src/ && perl Makefile.pl)
 
 common-configure-indep::
 	# Use perl rather than a diff here, to make sure all relevant
@@ -71,6 +72,13 @@ common-configure-indep::
 
 clean::
 	rm -f debian/awstats.conf debian/icons/firefox.png
+	# remove rebuilt files since we neither want nor can ship binary diffs.
+	rm -f wwwroot/classes/awgraphapplet.jar
+	rm -f wwwroot/classes/src/AWGraphApplet.class
+	# if we're working out of the pkg-awstats git tree, restore the
+	# original files to keep git happy.
+	[ ! -d .git ] || [ ! -x /usr/bin/git ] \
+		|| git checkout -f wwwroot/classes/awgraphapplet.jar
 
 # Remove badly coded PDF, and .cvsignore
 binary-post-install/awstats::

-- 
awstats Debian packaging