Updated debian settings for unstable/etch

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@5150 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/debian/control b/debian/control
index d27ec4c022b58d494c8e3a880eb2d528c0b43d4b..ec34fd6b92065c690e9f2719176dc8545c871198 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,8 +7,7 @@ Standards-Version: 3.7.2.0
 
 Package: gosa
 Architecture: all
-Depends: php4 (>= 4:4.3.10-16) | php5, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php4-gd | php5-gd, php4-imap | php5-imap, php4-ldap | php5-ldap, php4-mhash | php5-mhash, php4-mysql | php5-mysql, php4-imagick | php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php4-recode | php5-recode, wwwconfig-common
-Conflicts: smarty-gettext
+Depends: php4 (>= 4:4.3.10-16) | php5, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php4-gd | php5-gd, php4-imap | php5-imap, php4-ldap | php5-ldap, php4-mhash | php5-mhash, php4-mysql | php5-mysql, php4-imagick | php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, fping, libcrypt-smbhash-perl, smarty, php4-recode | php5-recode, wwwconfig-common, smarty-gettext
 Suggests: cupsys-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, php4-kadm5, php4-cups, etherwake, slapd, gosa-schema
 Description: Web Based LDAP Administration Program
  Provided is access to posix, shadow, samba, proxy, fax, pureftp and

diff --git a/debian/rules b/debian/rules
index a2b07abe4d382e91d26b0b07369379e4f12f10e9..1106c75cbeb9d26057f17b0bf28e5711c684ac49 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -80,8 +80,6 @@ install-stamp:
        -rm -rf debian/gosa/usr/share/gosa/gen_function_list.php
        -rm -rf debian/gosa/usr/share/gosa/update.sh
        -rm -rf debian/gosa/usr/share/doc/gosa/guide*
-       -mkdir -p debian/gosa/usr/share/php/smarty/libs/plugins
-       -cp include/smarty/plugins/block.t.php debian/gosa/usr/share/php/smarty/libs/plugins
        -rm -rf debian/gosa/usr/share/gosa/include/smarty
        -sed 's%"CONFIG_TEMPLATE_DIR", "../contrib/"%"CONFIG_TEMPLATE_DIR", "/usr/share/doc/gosa/contrib/"%g' debian/gosa/usr/share/gosa/include/functions.inc > debian/gosa/usr/share/gosa/include/functions.inc.new
        -mv debian/gosa/usr/share/gosa/include/functions.inc.new debian/gosa/usr/share/gosa/include/functions.inc