X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=104068f7d97735b204e63f1104cb93c23270d622;hb=95fe1a84d4b720e7413233c72c8c7c8c5d80e651;hp=41137ac7c07674f13102d9e9701749b10f48a755;hpb=1d7cddc3dbf36658cf722cbbe0afaa188c0677ea;p=gosa.git

diff --git a/debian/rules b/debian/rules
index 41137ac7c..104068f7d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,10 +24,10 @@ install-stamp:
 	dh_clean -k
 	dh_installdirs
 
-	for i in `cd gosa; ls | grep -v debian`; do \
+	for i in `ls | grep -v debian`; do \
 	  cp -R $$i debian/gosa/usr/share/gosa ; \
 	done
-	-find debian/gosa -type d -name "CVS" -exec rm -rf {} \;
+	-find debian/gosa -type d -name ".svn" -exec rm -rf {} \; &> /dev/null || /bin/true
 	-cp -R debian/gosa/usr/share/gosa/contrib/* debian/gosa/usr/share/doc/gosa/contrib/
 	-cp debian/gosa/usr/share/gosa/contrib/openldap/go*.schema debian/gosa-schema/etc/ldap/schema
 	-mkdir debian/gosa/usr/share/doc/gosa/manual
@@ -37,36 +37,42 @@ install-stamp:
 	-gzip -c9 debian/changelog > debian/gosa/usr/share/doc/gosa/changelog.Debian.gz
 	-gzip -c9 debian/changelog > debian/gosa-schema/usr/share/doc/gosa-schema/changelog.Debian.gz
 	-gzip -c9 Changelog > debian/gosa/usr/share/doc/gosa/changelog.gz
-	-cp AUTHORS TODO README FAQ debian/gosa/usr/share/doc/gosa/
+	-cp AUTHORS TODO README FAQ README.safemode DEVEL debian/gosa/usr/share/doc/gosa/
 	-rm debian/gosa/usr/share/gosa/README debian/gosa/usr/share/gosa/INSTALL
+	-rm debian/gosa/usr/share/gosa/README.safemode
 	-rm debian/gosa/usr/share/gosa/AUTHORS debian/gosa/usr/share/gosa/Changelog
+	-rm debian/gosa/usr/share/gosa/DEVEL
 	-rm debian/gosa/usr/share/gosa/COPYING debian/gosa/usr/share/gosa/TODO
 	-rm debian/gosa/usr/share/gosa/FAQ
-	-rm debian/gosa/usr/share/gosa/doxygen.conf
 	-mkdir -p debian/gosa/var/spool/gosa/compile
 	-mkdir -p debian/gosa/var/spool/gosa/config
 	-mkdir -p debian/gosa/var/spool/gosa/cache
 	-rm -rf debian/gosa/usr/share/gosa/compile
-	-cp -R debian/apache.conf debian/gosa/etc/gosa/apache.conf
 	-mkdir -p debian/gosa/etc/gosa/vacation
-	-mv plugins/personal/mail/sieve-*.txt debian/gosa/etc/gosa
-	-mv contrib/shells debian/gosa/etc/gosa
+	-cp -R debian/apache.conf debian/gosa/etc/gosa/apache.conf
+	-cp -R contrib/encodings debian/gosa/etc/gosa/encodings
+	-cp -R plugins/personal/mail/sieve-*.txt debian/gosa/etc/gosa
+	-cp contrib/shells debian/gosa/etc/gosa
 	-rm -rf debian/gosa/usr/share/gosa/contrib
 	-rm -rf debian/gosa/usr/share/gosa/doc
 	-rm debian/gosa/usr/share/gosa/bin/gosa
 	-mkdir -p debian/gosa/usr/lib/gosa
-	-mv bin/* debian/gosa/usr/lib/gosa
-	-chmod +x debian/gosa/user/lib/gosa/*
+	-mv debian/gosa/usr/share/gosa/bin/* debian/gosa/usr/bin
+	-rm -rf debian/gosa/usr/share/gosa/bin
+	-rm -rf debian/gosa/usr/share/doc/gosa/marketing
+	-find debian/gosa -type f -exec chmod -x {} \;
+	-chmod +x debian/gosa/usr/bin/mkntpasswd
+	-chmod +x debian/gosa/usr/lib/gosa/*
 	-rm -rf debian/gosa/usr/share/gosa/gen_locale.sh
+	-rm -rf debian/gosa/usr/share/gosa/gen_function_list.php
 	-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
+	-mkdir -p debian/gosa/usr/share/php/smarty/libs/plugins
+	-cp include/smarty/plugins/block.t.php debian/gosa/usr/share/php/smarty/libs/plugins
 	-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
-	-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
+	-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 debian/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 > debian/gosa/usr/share/gosa/include/php_setup.inc.new
+	-mv debian/gosa/usr/share/gosa/include/php_setup.inc.new debian/gosa/usr/share/gosa/include/php_setup.inc
 	touch install-stamp
 
 binary-indep: install