Updated debian builds to work with contributed smarty packages

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

diff --git a/debian/changelog b/debian/changelog
index 86ed45fd037f680d74505192ec4e090589b5e426..b1c10fc53bf7983e0700f5ad831efd50572021f8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 gosa (2.4beta1-1) unstable; urgency=low
 
   * New upstream release
+  * Removed smarty from package and use debian contributed
+    smarty releases
 
  -- Cajus Pollmeier <cajus@debian.org>  Thu,  3 Mar 2005 13:59:27 +0100
 

diff --git a/debian/control b/debian/control
index 023164019fecd640b9afb0c2abea751be8ba5aa9..ec3ab0168c5039bfdb7e5943a49a963b62dd78e5 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Standards-Version: 3.6.1.0
 
 Package: gosa
 Architecture: all
-Depends: php4 (>= 4.1.1-1) | libapache2-mod-php4, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php4-cgi | libapache2-mod-php4, php4-gd, php4-imap, php4-ldap, php4-mcrypt, php4-mhash, php4-mysql, php4-imagick | imagemagick (>= 5.4.4.5-1), fping, libcrypt-smbhash-perl
+Depends: php4 (>= 4.1.1-1) | libapache2-mod-php4, apache | apache-ssl | apache2-mpm-worker | apache2-mpm-threadpool | apache2-mpm-prefork | apache2-mpm-perchild, exim4 | mail-transport-agent, php4-cgi | libapache2-mod-php4, php4-gd, php4-imap, php4-ldap, php4-mcrypt, php4-mhash, php4-mysql, php4-imagick | imagemagick (>= 5.4.4.5-1), fping, libcrypt-smbhash-perl, smarty
 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 3daa1f76b19db86877e67673dcfb39d8aa41e7c5..41137ac7c07674f13102d9e9701749b10f48a755 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -59,10 +59,14 @@ install-stamp:
        -chmod +x debian/gosa/user/lib/gosa/*
        -rm -rf debian/gosa/usr/share/gosa/gen_locale.sh
        -rm -rf debian/gosa/usr/share/gosa/update.sh
+       -mkdir -p debian/gosa/usr/share/php/smarty/libs
+       -cp include/smarty/plugins/block.t.php debian/gosa/usr/share/php/smarty/libs
+       -rm -rf debian/gosa/usr/share/gosa/include/smarty
        -find debian/gosa -type f -exec chmod -x {} \;
-       -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
+       -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 gosa/usr/share/gosa/include/functions.inc
-
+       -sed 's%require("smarty/Smarty.class.php");%require("/usr/share/php/smarty/libs/Smarty.class.php");%g' debian/gosa/usr/share/gosa/include/php_setup.inc > gosa/usr/share/gosa/include/php_setup.inc.new
+       -mv debian/gosa/usr/share/gosa/include/php_setup.inc.new gosa/usr/share/gosa/include/php_setup.inc
        touch install-stamp
 
 binary-indep: install