Updated kolabSharedFolderTarget

[gosa.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index d9812f67a3c46ae311c89670232cfc782f8e592e..2e6ddf4f0cb960e01162ac18f14a94b64b13273c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ install-stamp:
        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 {} \; &> /dev/null || /bin/true
+       -find debian/gosa -type d -name ".svn" -exec rm -rf {} \; >/dev/null 2>&1
        -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
        -cp -R INSTALL debian/gosa/usr/share/doc/gosa/README.INSTALL
@@ -69,17 +69,17 @@ install-stamp:
        -cp -R plugins/personal/mail/sieve-*.txt debian/gosa/etc/gosa
        -cp contrib/shells debian/gosa/etc/gosa
        -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/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 {} \; &> /dev/null
+       -find debian/gosa -type f -exec chmod -x {} \; >/dev/null 2>&1
        -chmod +x debian/gosa/usr/bin/mkntpasswd
        -rm -rf debian/gosa/usr/share/gosa/doc/guide/user/*/lyx-source
        -rm -rf debian/gosa/usr/share/gosa/doc/guide/admin
        -rm -rf debian/gosa/usr/share/gosa/doc/guide/devel
        -for lang in en de fr nl; do mkdir -p debian/gosa-help-$$lang/usr/share/gosa/doc/guide/user/$$lang; done
        -for lang in en de fr nl; do mv debian/gosa/usr/share/gosa/doc/guide/user/$$lang/* debian/gosa-help-$$lang/usr/share/gosa/doc/guide/user/$$lang/; done
+       -rm -rf debian/gosa/usr/share/gosa/doc/guide/
        -cp -R debian/gosa/usr/share/gosa/doc/* debian/gosa/usr/share/doc/gosa
        -cp -R contrib/scripts/desktoprc debian/gosa-desktop/etc/gosa/desktoprc
        -cp -R contrib/scripts/start-gosa.sh debian/gosa-desktop/usr/bin/gosa
@@ -102,7 +102,6 @@ install-stamp:
                mv debian/gosa/usr/share/gosa/include/php_setup.inc.new debian/gosa/usr/share/gosa/include/php_setup.inc; \
        fi
        install -D -m 644 debian/overrides-lintian debian/gosa/usr/share/lintian/overrides/gosa
-       install -D -m 644 debian/overrides-linda debian/gosa/usr/share/linda/overrides/gosa
        touch install-stamp
 
 patch: patch-stamp
@@ -118,8 +117,7 @@ binary-indep: install
        dh_installexamples
        dh_installdebconf
        dh_installmenu
-       dh_installman --package=gosa debian/mkntpasswd.1
-       dh_installman --package=gosa-desktop debian/gosa.1
+       dh_installman
        dh_link
        dh_strip
        dh_compress --exclude=gosa.conf