From cfa94552c966332dbbc18bb6ea3b8ab9143f4651 Mon Sep 17 00:00:00 2001 From: Benjamin Sonntag Date: Wed, 31 Oct 2012 11:31:32 +0000 Subject: [PATCH] fixing bureau/class/local.php for L_VERSION + fixing .svn and Makefile in alternc-awstats package + fixing dependency of AlternC on its module versions --- bureau/class/local.php | 2 +- debian/control | 4 ++-- debian/rules | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/bureau/class/local.php b/bureau/class/local.php index f10ccde7..d3bd16ea 100644 --- a/bureau/class/local.php +++ b/bureau/class/local.php @@ -1,7 +1,7 @@ = 0.5.00) | debconf-2.0 Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, bind9, wget, rsync, quota, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), sudo, adduser, mysql-client, dnsutils, bash (>= 4), acl, dovecot-common (>= 1:1.2.15), dovecot-imapd, dovecot-pop3d, vlogger, mailx Recommends: mysql-server(>= 5.0), dovecot-managesieved, dovecot-sieve, dovecot-mysql, ntp -Conflicts: alternc-admintools, alternc-awstats (< 1.0), alternc-webalizer (<= 0.9.4), alternc-mailman (< 3.0~rc1), courier-authdaemon +Conflicts: alternc-admintools, alternc-awstats (< 1.0), alternc-webalizer (<= 0.9.4), alternc-mailman (< 2.0) Provides: alternc-admintools Replaces: alternc-admintools Suggests: alternc-awstats, alternc-mailman, alternc-changepass, amavisd-new, clamav-daemon, spamassassin, pop-before-smtp, magpierss, zip, ncompress, bzip2, alternc-squirrelmail, alternc-roundcube @@ -41,7 +41,7 @@ Architecture: all Pre-depends: debconf (>= 0.5.00) | debconf-2.0 Depends: debianutils (>= 1.13.1), apache2-mpm-itk, libapache2-mod-php5, php5-mysql, phpmyadmin, postfix, proftpd-mod-mysql, proftpd-basic, postfix-tls, bind9, wget, rsync, quota, ca-certificates, locales, perl-suid, perl, postfix-mysql, wwwconfig-common, sasl2-bin, libsasl2-modules, php5-cli, lockfile-progs (>= 0.1.9), gettext (>= 0.10.40-5), adduser, mysql-client, sudo, acl, dovecot-common (>= 1:1.2.15), dovecot-imapd, dovecot-pop3d Recommends: dovecot-managesieved, dovecot-sieve, dovecot-mysql -Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4), alternc, courier-authdaemon +Conflicts: alternc-admintools, alternc-awstats (<= 0.3.2), alternc-webalizer (<= 0.9.4), alternc Provides: alternc Replaces: alternc Suggests: alternc-awstats, alternc-mailman, alternc-changepass, amavisd-new, clamav-daemon, spamassassin, pop-before-smtp, magpierss, zip, ncompress, bzip2 diff --git a/debian/rules b/debian/rules index 63f72869..2d94bf00 100755 --- a/debian/rules +++ b/debian/rules @@ -111,6 +111,8 @@ install: build # Copy the desk files cp -r awstats/bureau debian/alternc-awstats/var/alternc/ + find debian/alternc-awstats/var/alternc/ -depth -iname ".svn" -exec rm -rf "{}" \; + rm debian/alternc-awstats/var/alternc/locales/Makefile # Fix permisions chown -R root:www-data debian/alternc-awstats/var/alternc/bureau