Updated rules to hide error messages

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

diff --git a/TODO b/TODO
index 7ad27fb0a3730867c30d6c2eda1321feb04566c7..2f558c7e88016dc2f892de7790fa3c00ca9e25d5 100644 (file)
--- a/TODO
+++ b/TODO
@@ -51,14 +51,27 @@ Things to fix before 2.4:
 
 * Saving of initially created gofon stuff fails
 
+<<<<<<< .mine
+* %telephoneNumber is not filled
+=======
 * Unterbäume in Applicatins wird nicht angezeigt
+>>>>>>> .r1434
 
+<<<<<<< .mine
+* lifetime must be numeric - wirklich toll
+=======
 * Terminals/Workstations lassen sich nicht speichern
+>>>>>>> .r1434
 
+<<<<<<< .mine
+
+
+=======
 * Basis wird bei diversen Dialogen nicht übernommen
 
 * Workstation is defekt
 
+>>>>>>> .r1434
 Target for 2.5:
 ===============
 

diff --git a/debian/rules b/debian/rules
index 5b28a84975abebdd3648d75b141fe7f2f434fae5..19e99df0c7f3e347cfc6d777904fd5aa4b8da90e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -27,7 +27,7 @@ install-stamp:
        for i in `cd gosa; 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
        -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