From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 19 Nov 2010 14:26:05 +0000 (+0000)
Subject: Added additional smarty packages to reflect missing files in squeeze
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=7205780900d1ca09f4e7f276ed2c94c9bf18a982;p=gosa.git

Added additional smarty packages to reflect missing files in squeeze


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

diff --git a/gosa-core/debian/control b/gosa-core/debian/control
index 72dc8b816..a97828860 100644
--- a/gosa-core/debian/control
+++ b/gosa-core/debian/control
@@ -13,7 +13,7 @@ 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, smarty, php5-recode, smarty-gettext, smarty-acl-render, gettext, ${misc:Depends}, libapache2-mod-php5 | php5-cgi
+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
 Suggests: gosa-si-server, cyrus21-imapd (>= 2.1.11), postfix-ldap, slapd, gosa-schema, php5-suhosin, php-apc, php-fpdf
 Description: Web Based LDAP Administration Program
  Provided is access to posix, shadow, samba, proxy, fax, pureftp and
@@ -89,12 +89,24 @@ 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: smarty-acl-render
+Package: smarty3-gosa
 Architecture: all
-Depends: ${misc:Depends}, smarty
+Depends: ${misc:Depends}, smarty3
 Suggests: gosa
 Description: Provide ACL based rendering for Smarty
- smarty-acl-render provides acl based rendering support 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².
  .
diff --git a/gosa-core/debian/patches/01_fix_smarty_location.patch b/gosa-core/debian/patches/01_fix_smarty_location.patch
index 4596ba8de..d5d9f8a78 100644
--- a/gosa-core/debian/patches/01_fix_smarty_location.patch
+++ b/gosa-core/debian/patches/01_fix_smarty_location.patch
@@ -7,10 +7,10 @@ Description: Adapt location for debian packaged smarty
  
  /* Do smarty setup */
 -require("smarty/Smarty.class.php");
-+if (file_exists("/usr/share/php/smarty/Smarty.class.php")){
-+	require("/usr/share/php/smarty/Smarty.class.php");
++if (file_exists("/usr/share/php/smarty3/Smarty.class.php")){
++	require("/usr/share/php/smarty3/Smarty.class.php");
 +} else {
-+	require("/usr/share/php/smarty/libs/Smarty.class.php");
++	require("/usr/share/php/smarty3/libs/Smarty.class.php");
 +}
  $smarty = new Smarty;
  $smarty->template_dir = $BASE_DIR.'/ihtml/';
diff --git a/gosa-core/debian/smarty-acl-render.dirs b/gosa-core/debian/smarty-acl-render.dirs
deleted file mode 100644
index baad34c2b..000000000
--- a/gosa-core/debian/smarty-acl-render.dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/php/smarty/libs/plugins
diff --git a/gosa-core/debian/smarty-acl-render.install b/gosa-core/debian/smarty-acl-render.install
deleted file mode 100644
index 5f37943a2..000000000
--- a/gosa-core/debian/smarty-acl-render.install
+++ /dev/null
@@ -1,4 +0,0 @@
-gosa-core/include/smarty/plugins/block.render.php     /usr/share/php/smarty/libs/plugins
-gosa-core/include/smarty/plugins/function.msgPool.php /usr/share/php/smarty/libs/plugins
-gosa-core/include/smarty/plugins/function.image.php   /usr/share/php/smarty/libs/plugins
-gosa-core/include/smarty/plugins/function.factory.php /usr/share/php/smarty/libs/plugins
diff --git a/gosa-core/debian/smarty3-gosa.dirs b/gosa-core/debian/smarty3-gosa.dirs
new file mode 100644
index 000000000..cc2c330d7
--- /dev/null
+++ b/gosa-core/debian/smarty3-gosa.dirs
@@ -0,0 +1 @@
+usr/share/php/smarty3/libs/plugins
diff --git a/gosa-core/debian/smarty3-gosa.install b/gosa-core/debian/smarty3-gosa.install
new file mode 100644
index 000000000..6d64c906d
--- /dev/null
+++ b/gosa-core/debian/smarty3-gosa.install
@@ -0,0 +1,4 @@
+gosa-core/include/smarty/plugins/block.render.php     /usr/share/php/smarty3/libs/plugins
+gosa-core/include/smarty/plugins/function.msgPool.php /usr/share/php/smarty3/libs/plugins
+gosa-core/include/smarty/plugins/function.image.php   /usr/share/php/smarty3/libs/plugins
+gosa-core/include/smarty/plugins/function.factory.php /usr/share/php/smarty3/libs/plugins