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

[Sergey B Kirpichev]

The following commit has been merged in the master branch:
commit 5902af3439f5d3b0cd5581c51adaf8d1b7d8ac3b
Merge: 7be144ab27c46d97996bf85ff92a0f3e9462df8e 1fb607e177672b10b6941d306e868eac9721aa60
Author: Sergey B Kirpichev <skirpichev at gmail.com>
Date:   Fri May 22 14:32:04 2009 +0400

    Merge master

diff --combined debian/awstats.cron.d
index 477f560,695a499..d9c7353
--- a/debian/awstats.cron.d
+++ b/debian/awstats.cron.d
@@@ -1,4 -1,1 +1,4 @@@
- */10 * * * * www-data [ -x /usr/lib/cgi-bin/awstats.pl ] && /usr/lib/cgi-bin/awstats.pl -config=awstats -update >/dev/null
+ */10 * * * * www-data /usr/share/awstats/tools/update.sh
 +
 +# Generate static reports:
- 10 03 * * * awstats /usr/share/awstats/tools/buildstatic.sh
++10 03 * * * www-data /usr/share/awstats/tools/buildstatic.sh
diff --combined debian/awstats.install
index c0ce213,a8f224d..b88f4c7
--- a/debian/awstats.install
+++ b/debian/awstats.install
@@@ -1,4 -1,3 +1,4 @@@
 +debian/default/*		etc/default/
  debian/awstats.conf*		etc/awstats/
  docs/*				usr/share/doc/awstats/html/
  wwwroot/cgi-bin/awstats.pl	usr/lib/cgi-bin/
@@@ -6,7 -5,6 +6,8 @@@ wwwroot/cgi-bin/lang/*		usr/share/awsta
  wwwroot/cgi-bin/lib/*		usr/share/awstats/lib/
  wwwroot/cgi-bin/plugins/*.pm	usr/share/awstats/plugins/
  wwwroot/icon/*			usr/share/awstats/icon/
+ debian/update.sh	usr/share/awstats/tools/
 +tools/awstats_buildstaticpages.pl	usr/share/awstats/tools/
 +debian/buildstatic.sh		usr/share/awstats/tools/
  
  debian/icons/firefox.png			usr/share/awstats/icon/browser/
diff --combined debian/rules
index a0eb9b5,f31b0c2..b2ba1d9
--- a/debian/rules
+++ b/debian/rules
@@@ -37,9 -37,9 +37,9 @@@ DEB_UPSTREAM_REPACKAGE_EXCLUDE = wwwroo
  DEB_INSTALL_CHANGELOGS_ALL = docs/awstats_changelog.txt
  DEB_INSTALL_DOCS_ALL = README.TXT
  
- awstats_example_scripts = $(wildcard tools/[^a]*.pl tools/awstats_[^b]*.pl) $(wildcard debian/examples/*.sh) debian/examples/awstats-update
 -awstats_example_scripts = $(wildcard tools/*.pl) $(wildcard debian/examples/*.sh)
++awstats_example_scripts = $(wildcard tools/[^a]*.pl tools/awstats_[^b]*.pl) $(wildcard debian/examples/*.sh)
  
- DEB_INSTALL_EXAMPLES_awstats = $(awstats_example_scripts) debian/examples/apache.conf debian/examples/awstats-update.8 wwwroot/cgi-bin/awstats.model.conf wwwroot/cgi-bin/plugins/example/* wwwroot/css wwwroot/js tools/xslt
+ DEB_INSTALL_EXAMPLES_awstats = $(awstats_example_scripts) debian/examples/apache.conf wwwroot/cgi-bin/awstats.model.conf wwwroot/cgi-bin/plugins/example/* wwwroot/css wwwroot/js tools/xslt
  DEB_COMPRESS_EXCLUDE = $(notdir $(awstats_example_scripts)) awstats.ico
  
  pre-build::

-- 
awstats Debian packaging