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 edc68e81889d800ac4dbde2409af5f3f21e7dded..ae1081d9382b71442a7c5841902027606b9ef640 100644 (file)
--- 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 b31393d00fc9f87cc7381c0b75a182da42db40dc..e67d1410ebe21f445aacec2606f7f903e4b6a84a 100755 (executable)
--- 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 b78b143d177e2824aafa4fc4837c4e52c7c598e4..d78a58d77c394ef03f0e313fbd914461777ce786 100755 (executable)
--- 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\