Updated debian infrastructure

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

diff --git a/debian/changelog b/debian/changelog
index 4e734b1a53af127f59374a7b2daad9168db91463..1c2f0e74ac4920b91302fafc2f32bebef6016c11 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ gosa (2.5.16-1) unstable; urgency=low
   * Included spanish debconf translation (Closes #472271)
   * Fixed problem with broken characters in the password fields (Closes #470303)
   * Added apache configuration advisory to the README.debian
+  * Removed additional bashisms from the rules file (Closes #478388)
 
  -- Cajus Pollmeier <cajus@debian.org>  Fri, 04 Apr 2008 09:03:52 +0200
 

diff --git a/debian/rules b/debian/rules
index d9812f67a3c46ae311c89670232cfc782f8e592e..0d320a8dad8206947a4aea0b576a9de1e930965a 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