From 9279a40bdddcebbe164fc3c0d6397673fa68b519 Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 28 Sep 2005 13:44:08 +0000
Subject: [PATCH] Updated rules to hide error messages

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@1435 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 TODO         | 13 +++++++++++++
 debian/rules |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 7ad27fb0a..2f558c7e8 100644
--- 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 5b28a8497..19e99df0c 100755
--- 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
-- 
2.30.2