From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 8 Oct 2008 16:24:52 +0000 (+0000)
Subject: Updated smarty inclusion and postinst
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=3cd426428c0e4e6b1f97be680a28a944bacca403;p=gosa.git

Updated smarty inclusion and postinst


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

diff --git a/gosa-core/debian/gosa.postinst b/gosa-core/debian/gosa.postinst
index edc68e818..ae1081d93 100644
--- a/gosa-core/debian/gosa.postinst
+++ b/gosa-core/debian/gosa.postinst
@@ -64,8 +64,7 @@ chmod 770 -R /var/cache/gosa
 # Add support for RequestHeader
 a2enmod headers
 
-# Update gosa
-/usr/sbin/update-gosa
+update-gosa
 
 # Finally restart servers
 if [ -x /usr/sbin/invoke-rc.d ]; then
diff --git a/gosa-core/debian/rules b/gosa-core/debian/rules
index b31393d00..e67d1410e 100755
--- a/gosa-core/debian/rules
+++ b/gosa-core/debian/rules
@@ -58,6 +58,7 @@ binary-common:
 	dh_installmenu
 	dh_installdebconf	
 	dh_installman
+	rm -rf debian/gosa/usr/share/gosa/include/smarty
 	dh_strip
 	dh_compress
 	# This is an ugly workaround to preserve gosa.conf from beeing compressed. Excluding it
diff --git a/gosa-core/dh-make-gosa b/gosa-core/dh-make-gosa
index b78b143d1..d78a58d77 100755
--- a/gosa-core/dh-make-gosa
+++ b/gosa-core/dh-make-gosa
@@ -332,7 +332,7 @@ for srv in apache apache-ssl apache2; do\
 done\
 \
 # Update gosa\
-/usr/sbin/update-gosa\
+update-gosa\
 \
 # Finally restart servers\
 for server in $servers; do\