X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=debian%2Frules;h=62f894f83b74384090d9f9ebf7a7b9ace5b93ada;hb=58396d3ec17d5f6ad04e655c3da0ba99ad6b2faa;hp=5b28a84975abebdd3648d75b141fe7f2f434fae5;hpb=ff3562e23a1ddcd4d12b8d3ed17c088e63380658;p=gosa.git

diff --git a/debian/rules b/debian/rules
index 5b28a8497..62f894f83 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,44 +24,48 @@ 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 ".svn" -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
+	-mkdir debian/gosa/usr/share/gosa/bin
 	-mkdir -p debian/gosa-schema/usr/share/doc/gosa-schema
 	-cp -R debian/gosa/usr/share/gosa/doc/* debian/gosa/usr/share/doc/gosa/manual
 	-cp -R INSTALL debian/gosa/usr/share/doc/gosa/README.INSTALL
 	-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 README.openxchange README.safemode DEVEL 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.openxchange debian/gosa/usr/share/gosa/README.safemode
+	-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
 	-mkdir -p debian/gosa/etc/gosa/vacation
 	-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 debian/gosa/usr/share/gosa/bin/* debian/gosa/usr/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/plugins
 	-cp include/smarty/plugins/block.t.php debian/gosa/usr/share/php/smarty/libs/plugins