From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 25 Oct 2011 12:10:31 +0000 (+0000)
Subject: Removed more smarty parts
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=141a143546d02fb61e9614918f07a9535cfa6d8a;p=gosa.git

Removed more smarty parts


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

diff --git a/gosa-core/debian/control.in b/gosa-core/debian/control.in
index e91292022..c6ff4ac3c 100644
--- a/gosa-core/debian/control.in
+++ b/gosa-core/debian/control.in
@@ -13,8 +13,9 @@ DM-Upload-Allowed: yes
 
 Package: gosa
 Architecture: all
-Depends: php5, php5-cli, apache2 | lighttpd | httpd , exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mcrypt, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, libcrypt-smbhash-perl, php5-recode, smarty3-gettext, smarty3-gosa, gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-curl
+Depends: php5, php5-cli, apache2 | lighttpd | httpd , exim4 | mail-transport-agent, php5-gd, php5-imap, php5-ldap, php5-mcrypt, php5-mysql, php5-imagick | imagemagick (>= 5.4.4.5-1) | graphicsmagick-im-compat, libcrypt-smbhash-perl, php5-recode, smarty3, gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi, php5-curl
 Suggests: gosa-si-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, slapd, gosa-schema, php5-suhosin, php-apc, php-fpdf
+Conflicts: smarty3-gettext, smarty3-gosa, smarty-acl-render
 Description: Web Based LDAP Administration Program
  Provided is access to posix, shadow, samba, proxy, fax, pureftp and
  kerberos accounts. It is able to manage the postfix/cyrus server
@@ -89,30 +90,6 @@ Description: Dutch online help for GOsa
  GOsa² is a combination of system-administrator and end-user web
  interface, designed to handle LDAP based setups.
 
-Package: smarty3-gosa
-Architecture: all
-Depends: ${misc:Depends}, smarty3
-Suggests: gosa
-Description: Provide ACL based rendering for Smarty
- smarty3-gosa provides acl based rendering support for Smarty,
- the popular PHP templating engine (http://smarty.php.net/). This
- module is mainly used by GOsa².
- .
- GOsa² is a combination of system-administrator and end-user web
- interface, designed to handle LDAP based setups.
-
-Package: smarty3-gettext
-Architecture: all
-Depends: ${misc:Depends}, smarty3
-Suggests: gosa
-Description: Provide gettext support for Smarty
- smarty3-gettext provides getext based rendering support for Smarty,
- the popular PHP templating engine (http://smarty.php.net/). This
- module is mainly used by GOsa².
- .
- GOsa² is a combination of system-administrator and end-user web
- interface, designed to handle LDAP based setups.
-
 Package: smarty3
 Architecture: all
 Depends: php5 | php5-cgi | php5-cli, ${misc:Depends}
diff --git a/gosa-core/debian/smarty3-gettext.dirs b/gosa-core/debian/smarty3-gettext.dirs
deleted file mode 100644
index cc2c330d7..000000000
--- a/gosa-core/debian/smarty3-gettext.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/php/smarty3/libs/plugins
diff --git a/gosa-core/debian/smarty3-gettext.install b/gosa-core/debian/smarty3-gettext.install
deleted file mode 100644
index bbf0229a7..000000000
--- a/gosa-core/debian/smarty3-gettext.install
+++ /dev/null
@@ -1 +0,0 @@
-gosa-core/include/smarty/plugins/block.t.php     /usr/share/php/smarty3/plugins
diff --git a/gosa-core/debian/smarty3-gosa.dirs b/gosa-core/debian/smarty3-gosa.dirs
deleted file mode 100644
index cc2c330d7..000000000
--- a/gosa-core/debian/smarty3-gosa.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/php/smarty3/libs/plugins
diff --git a/gosa-core/debian/smarty3-gosa.install b/gosa-core/debian/smarty3-gosa.install
deleted file mode 100644
index 3fcf386d5..000000000
--- a/gosa-core/debian/smarty3-gosa.install
+++ /dev/null
@@ -1,4 +0,0 @@
-gosa-core/include/smarty/plugins/block.render.php     /usr/share/php/smarty3/plugins
-gosa-core/include/smarty/plugins/function.msgPool.php /usr/share/php/smarty3/plugins
-gosa-core/include/smarty/plugins/function.image.php   /usr/share/php/smarty3/plugins
-gosa-core/include/smarty/plugins/function.factory.php /usr/share/php/smarty3/plugins